/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

merge

Show diffs side-by-side

added added

removed removed

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