/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-05-03 19:06:02 UTC
  • Revision ID: teddy@recompile.se-20120503190602-uqghef5rbpqdvybx
* mandos-monitor: Use new string format method.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
322
322
        elif state == avahi.ENTRY_GROUP_FAILURE:
323
323
            logger.critical("Avahi: Error in group state changed %s",
324
324
                            unicode(error))
325
 
            raise AvahiGroupError("State changed: %s"
326
 
                                  % unicode(error))
 
325
            raise AvahiGroupError("State changed: {0!s}"
 
326
                                  .format(error))
327
327
    def cleanup(self):
328
328
        """Derived from the Avahi example code"""
329
329
        if self.group is not None:
375
375
        """Add the new name to the syslog messages"""
376
376
        ret = AvahiService.rename(self)
377
377
        syslogger.setFormatter(logging.Formatter
378
 
                               ('Mandos (%s) [%%(process)d]:'
379
 
                                ' %%(levelname)s: %%(message)s'
380
 
                                % self.name))
 
378
                               ('Mandos ({0}) [%(process)d]:'
 
379
                                ' %(levelname)s: %(message)s'
 
380
                                .format(self.name)))
381
381
        return ret
382
382
 
383
383
def timedelta_to_milliseconds(td):
489
489
                          "rb") as secfile:
490
490
                    client["secret"] = secfile.read()
491
491
            else:
492
 
                raise TypeError("No secret or secfile for section %s"
493
 
                                % section)
 
492
                raise TypeError("No secret or secfile for section {0}"
 
493
                                .format(section))
494
494
            client["timeout"] = string_to_delta(section["timeout"])
495
495
            client["extended_timeout"] = string_to_delta(
496
496
                section["extended_timeout"])
758
758
    # "Set" method, so we fail early here:
759
759
    if byte_arrays and signature != "ay":
760
760
        raise ValueError("Byte arrays not supported for non-'ay'"
761
 
                         " signature %r" % signature)
 
761
                         " signature {0!r}".format(signature))
762
762
    def decorator(func):
763
763
        func._dbus_is_property = True
764
764
        func._dbus_interface = dbus_interface
2079
2079
            elif suffix == "w":
2080
2080
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2081
2081
            else:
2082
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2082
                raise ValueError("Unknown suffix {0!r}"
 
2083
                                 .format(suffix))
2083
2084
        except (ValueError, IndexError) as e:
2084
2085
            raise ValueError(*(e.args))
2085
2086
        timevalue += delta
2102
2103
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2103
2104
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2104
2105
            raise OSError(errno.ENODEV,
2105
 
                          "%s not a character device"
2106
 
                          % os.devnull)
 
2106
                          "{0} not a character device"
 
2107
                          .format(os.devnull))
2107
2108
        os.dup2(null, sys.stdin.fileno())
2108
2109
        os.dup2(null, sys.stdout.fileno())
2109
2110
        os.dup2(null, sys.stderr.fileno())
2118
2119
    
2119
2120
    parser = argparse.ArgumentParser()
2120
2121
    parser.add_argument("-v", "--version", action="version",
2121
 
                        version = "%%(prog)s %s" % version,
 
2122
                        version = "%(prog)s {0}".format(version),
2122
2123
                        help="show version number and exit")
2123
2124
    parser.add_argument("-i", "--interface", metavar="IF",
2124
2125
                        help="Bind to interface IF")
2227
2228
    
2228
2229
    if server_settings["servicename"] != "Mandos":
2229
2230
        syslogger.setFormatter(logging.Formatter
2230
 
                               ('Mandos (%s) [%%(process)d]:'
2231
 
                                ' %%(levelname)s: %%(message)s'
2232
 
                                % server_settings["servicename"]))
 
2231
                               ('Mandos ({0}) [%(process)d]:'
 
2232
                                ' %(levelname)s: %(message)s'
 
2233
                                .format(server_settings
 
2234
                                        ["servicename"])))
2233
2235
    
2234
2236
    # Parse config file with clients
2235
2237
    client_config = configparser.SafeConfigParser(Client
2599
2601
    service.port = tcp_server.socket.getsockname()[1]
2600
2602
    if use_ipv6:
2601
2603
        logger.info("Now listening on address %r, port %d,"
2602
 
                    " flowinfo %d, scope_id %d"
2603
 
                    % tcp_server.socket.getsockname())
 
2604
                    " flowinfo %d, scope_id %d",
 
2605
                    *tcp_server.socket.getsockname())
2604
2606
    else:                       # IPv4
2605
 
        logger.info("Now listening on address %r, port %d"
2606
 
                    % tcp_server.socket.getsockname())
 
2607
        logger.info("Now listening on address %r, port %d",
 
2608
                    *tcp_server.socket.getsockname())
2607
2609
    
2608
2610
    #service.interface = tcp_server.socket.getsockname()[3]
2609
2611