/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 04:56:00 UTC
  • mfrom: (24.1.27 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080809045600-m7jx3tj4wwunaffa
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
61
61
from dbus.mainloop.glib import DBusGMainLoop
62
62
import ctypes
63
63
 
64
 
version = "1.0"
65
64
 
66
65
logger = logging.Logger('mandos')
67
66
syslogger = logging.handlers.SysLogHandler\
71
70
                        ('Mandos: %(levelname)s: %(message)s'))
72
71
logger.addHandler(syslogger)
73
72
 
74
 
console = logging.StreamHandler()
75
 
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
76
 
                                       ' %(message)s'))
77
 
logger.addHandler(console)
78
73
 
79
74
class AvahiError(Exception):
80
75
    def __init__(self, value):
658
653
    global main_loop_started
659
654
    main_loop_started = False
660
655
    
661
 
    parser = OptionParser(version = "%%prog %s" % version)
 
656
    parser = OptionParser()
662
657
    parser.add_option("-i", "--interface", type="string",
663
658
                      metavar="IF", help="Bind to interface IF")
664
659
    parser.add_option("-a", "--address", type="string",
721
716
    
722
717
    if not debug:
723
718
        syslogger.setLevel(logging.WARNING)
724
 
        console.setLevel(logging.WARNING)
725
719
    
726
720
    if server_settings["servicename"] != "Mandos":
727
721
        syslogger.setFormatter(logging.Formatter\
756
750
            avahi.DBUS_INTERFACE_SERVER )
757
751
    # End of Avahi example code
758
752
    
 
753
    if debug:
 
754
        console = logging.StreamHandler()
 
755
        # console.setLevel(logging.DEBUG)
 
756
        console.setFormatter(logging.Formatter\
 
757
                             ('%(levelname)s: %(message)s'))
 
758
        logger.addHandler(console)
 
759
        del console
 
760
    
759
761
    clients = Set()
760
762
    def remove_from_clients(client):
761
763
        clients.remove(client)
773
775
        sys.exit(1)
774
776
    
775
777
    if not debug:
776
 
        logger.removeHandler(console)
777
778
        daemon()
778
779
    
779
780
    pidfilename = "/var/run/mandos/mandos.pid"