/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: 2008-08-09 02:53:48 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080809025348-2xk3e41pptc3hsl6
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
          Include "Mandos" in the log message.
  (AvahiService.max_renames): Increased to 32768.
  (AvahiService.rename): Alter the syslogger message.
  (main): Only log debug messages if in debug mode.  If different from
          "Mandos" include service name in syslog message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
64
64
 
65
65
logger = logging.Logger('mandos')
66
66
syslogger = logging.handlers.SysLogHandler\
67
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON)
 
67
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
68
             address = "/dev/log")
68
69
syslogger.setFormatter(logging.Formatter\
69
 
                        ('%(levelname)s: %(message)s'))
 
70
                        ('Mandos: %(levelname)s: %(message)s'))
70
71
logger.addHandler(syslogger)
71
 
del syslogger
72
72
 
73
73
 
74
74
class AvahiError(Exception):
102
102
    """
103
103
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
104
104
                 type = None, port = None, TXT = None, domain = "",
105
 
                 host = "", max_renames = 12):
 
105
                 host = "", max_renames = 32768):
106
106
        self.interface = interface
107
107
        self.name = name
108
108
        self.type = type
122
122
            raise AvahiServiceError("Too many renames")
123
123
        name = server.GetAlternativeServiceName(name)
124
124
        logger.error(u"Changing name to %r ...", name)
 
125
        syslogger.setFormatter(logging.Formatter\
 
126
                               ('Mandos (%s): %%(levelname)s:'
 
127
                               ' %%(message)s' % name))
125
128
        self.remove()
126
129
        self.add()
127
130
        self.rename_count += 1
709
712
    del options
710
713
    # Now we have our good server settings in "server_settings"
711
714
    
 
715
    debug = server_settings["debug"]
 
716
    
 
717
    if not debug:
 
718
        syslogger.setLevel(logging.WARNING)
 
719
    
 
720
    if server_settings["servicename"] != "Mandos":
 
721
        syslogger.setFormatter(logging.Formatter\
 
722
                               ('Mandos (%s): %%(levelname)s:'
 
723
                                ' %%(message)s'
 
724
                                % server_settings["servicename"]))
 
725
    
712
726
    # Parse config file with clients
713
727
    client_defaults = { "timeout": "1h",
714
728
                        "interval": "5m",
736
750
            avahi.DBUS_INTERFACE_SERVER )
737
751
    # End of Avahi example code
738
752
    
739
 
    debug = server_settings["debug"]
740
 
    
741
753
    if debug:
742
754
        console = logging.StreamHandler()
743
755
        # console.setLevel(logging.DEBUG)