/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

removed * [[http://en.tldp.org/HOWTO/Software-Release-Practice-HOWTO/][Software Release Practice HOWTO]]

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):
119
114
        self.domain = domain
120
115
        self.host = host
121
116
        self.rename_count = 0
122
 
        self.max_renames = max_renames
123
117
    def rename(self):
124
118
        """Derived from the Avahi example code"""
125
119
        if self.rename_count >= self.max_renames:
126
120
            logger.critical(u"No suitable service name found after %i"
127
121
                            u" retries, exiting.", rename_count)
128
122
            raise AvahiServiceError("Too many renames")
129
 
        self.name = server.GetAlternativeServiceName(self.name)
130
 
        logger.info(u"Changing name to %r ...", str(self.name))
 
123
        name = server.GetAlternativeServiceName(name)
 
124
        logger.error(u"Changing name to %r ...", name)
131
125
        syslogger.setFormatter(logging.Formatter\
132
126
                               ('Mandos (%s): %%(levelname)s:'
133
 
                               ' %%(message)s' % self.name))
 
127
                               ' %%(message)s' % name))
134
128
        self.remove()
135
129
        self.add()
136
130
        self.rename_count += 1
659
653
    global main_loop_started
660
654
    main_loop_started = False
661
655
    
662
 
    parser = OptionParser(version = "%%prog %s" % version)
 
656
    parser = OptionParser()
663
657
    parser.add_option("-i", "--interface", type="string",
664
658
                      metavar="IF", help="Bind to interface IF")
665
659
    parser.add_option("-a", "--address", type="string",
700
694
    server_config = ConfigParser.SafeConfigParser(server_defaults)
701
695
    del server_defaults
702
696
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
697
    server_section = "server"
703
698
    # Convert the SafeConfigParser object to a dict
704
 
    server_settings = server_config.defaults()
 
699
    server_settings = dict(server_config.items(server_section))
705
700
    # Use getboolean on the boolean config option
706
701
    server_settings["debug"] = server_config.getboolean\
707
 
                               ("DEFAULT", "debug")
 
702
                               (server_section, "debug")
708
703
    del server_config
709
704
    
710
705
    # Override the settings from the config file with command line
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"