/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: Björn Påhlsson
  • Date: 2011-11-24 19:09:29 UTC
  • mto: (518.2.5 persistent-state-gpgme)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: belorn@fukt.bsnet.se-20111124190929-9gmyfy7tyzuztjzx
restructured logger
added documentation about NewRequest dbus signal

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
86
86
 
87
87
 
88
88
version = "1.4.1"
 
89
stored_state_path = "/var/lib/mandos/clients.pickle"
89
90
 
90
91
logger = logging.getLogger()
91
 
stored_state_path = "/var/lib/mandos/clients.pickle"
92
 
 
93
92
syslogger = (logging.handlers.SysLogHandler
94
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
94
              address = str("/dev/log")))
96
 
syslogger.setFormatter(logging.Formatter
97
 
                       ('Mandos [%(process)d]: %(levelname)s:'
98
 
                        ' %(message)s'))
99
 
logger.addHandler(syslogger)
100
95
 
101
 
console = logging.StreamHandler()
102
 
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
 
                                       ' [%(process)d]:'
104
 
                                       ' %(levelname)s:'
105
 
                                       ' %(message)s'))
106
 
logger.addHandler(console)
 
96
def initlogger(level=logging.WARNING):
 
97
    """init logger and add loglevel"""
 
98
    
 
99
    syslogger.setFormatter(logging.Formatter
 
100
                           ('Mandos [%(process)d]: %(levelname)s:'
 
101
                            ' %(message)s'))
 
102
    logger.addHandler(syslogger)
 
103
    
 
104
    console = logging.StreamHandler()
 
105
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
106
                                           ' [%(process)d]:'
 
107
                                           ' %(levelname)s:'
 
108
                                           ' %(message)s'))
 
109
    logger.addHandler(console)
 
110
    logger.setLevel(level)
107
111
 
108
112
 
109
113
class AvahiError(Exception):
1995
1999
    use_dbus = server_settings["use_dbus"]
1996
2000
    use_ipv6 = server_settings["use_ipv6"]
1997
2001
    
 
2002
    if debug:
 
2003
        initlogger(logging.DEBUG)
 
2004
    else:
 
2005
        if not debuglevel:
 
2006
            initlogger()
 
2007
        else:
 
2008
            level = getattr(logging, debuglevel.upper())
 
2009
            initlogger(level)    
 
2010
    
1998
2011
    if server_settings["servicename"] != "Mandos":
1999
2012
        syslogger.setFormatter(logging.Formatter
2000
2013
                               ('Mandos (%s) [%%(process)d]:'
2054
2067
        if error[0] != errno.EPERM:
2055
2068
            raise error
2056
2069
    
2057
 
    if not debug and not debuglevel:
2058
 
        logger.setLevel(logging.WARNING)
2059
 
    if debuglevel:
2060
 
        level = getattr(logging, debuglevel.upper())
2061
 
        logger.setLevel(level)
2062
 
    
2063
2070
    if debug:
2064
 
        logger.setLevel(logging.DEBUG)
2065
2071
        # Enable all possible GnuTLS debugging
2066
2072
        
2067
2073
        # "Use a log level over 10 to enable all debugging options."