=== modified file 'TODO'
--- TODO	2008-08-10 03:32:42 +0000
+++ TODO	2008-08-10 16:13:23 +0000
@@ -150,6 +150,8 @@
 ** /etc/initramfs-tools/hooks/mandos
    [[file:/usr/share/doc/initramfs-tools/examples/example_hook][Example initramfs-tools hook script]]
 *** Create GPG key ring files in initrd
+** unperish
+** bzr-builddeb
 
 * INSTALL file
 

=== modified file 'mandos'
--- mandos	2008-08-10 02:01:04 +0000
+++ mandos	2008-08-10 16:13:23 +0000
@@ -71,6 +71,10 @@
                         ('Mandos: %(levelname)s: %(message)s'))
 logger.addHandler(syslogger)
 
+console = logging.StreamHandler()
+console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
+                                       ' %(message)s'))
+logger.addHandler(console)
 
 class AvahiError(Exception):
     def __init__(self, value):
@@ -717,6 +721,7 @@
     
     if not debug:
         syslogger.setLevel(logging.WARNING)
+        console.setLevel(logging.WARNING)
     
     if server_settings["servicename"] != "Mandos":
         syslogger.setFormatter(logging.Formatter\
@@ -751,14 +756,6 @@
             avahi.DBUS_INTERFACE_SERVER )
     # End of Avahi example code
     
-    if debug:
-        console = logging.StreamHandler()
-        # console.setLevel(logging.DEBUG)
-        console.setFormatter(logging.Formatter\
-                             ('%(levelname)s: %(message)s'))
-        logger.addHandler(console)
-        del console
-    
     clients = Set()
     def remove_from_clients(client):
         clients.remove(client)
@@ -776,6 +773,7 @@
         sys.exit(1)
     
     if not debug:
+        logger.removeHandler(console)
         daemon()
     
     pidfilename = "/var/run/mandos/mandos.pid"