/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-18 03:50:28 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080818035028-su31apqs2pv2147v
* mandos-keygen.xml: Removed <?xml-stylesheet>.  New entity
                     "&OVERVIEW;" referring to "overview.xml".
  (PURPOSE, OVERVIEW): New sections, same as in mandos(8).
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).

* mandos.xml (OPTIONS, CLIENTS): Slight wording change.

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)
74
78
 
75
79
class AvahiError(Exception):
76
80
    def __init__(self, value):
115
119
        self.domain = domain
116
120
        self.host = host
117
121
        self.rename_count = 0
 
122
        self.max_renames = max_renames
118
123
    def rename(self):
119
124
        """Derived from the Avahi example code"""
120
125
        if self.rename_count >= self.max_renames:
121
126
            logger.critical(u"No suitable service name found after %i"
122
127
                            u" retries, exiting.", rename_count)
123
128
            raise AvahiServiceError("Too many renames")
124
 
        name = server.GetAlternativeServiceName(name)
125
 
        logger.error(u"Changing name to %r ...", name)
 
129
        self.name = server.GetAlternativeServiceName(self.name)
 
130
        logger.info(u"Changing name to %r ...", str(self.name))
126
131
        syslogger.setFormatter(logging.Formatter\
127
132
                               ('Mandos (%s): %%(levelname)s:'
128
 
                               ' %%(message)s' % name))
 
133
                               ' %%(message)s' % self.name))
129
134
        self.remove()
130
135
        self.add()
131
136
        self.rename_count += 1
654
659
    global main_loop_started
655
660
    main_loop_started = False
656
661
    
657
 
    parser = OptionParser(version = "Mandos server %s" % version)
 
662
    parser = OptionParser(version = "%%prog %s" % version)
658
663
    parser.add_option("-i", "--interface", type="string",
659
664
                      metavar="IF", help="Bind to interface IF")
660
665
    parser.add_option("-a", "--address", type="string",
717
722
    
718
723
    if not debug:
719
724
        syslogger.setLevel(logging.WARNING)
 
725
        console.setLevel(logging.WARNING)
720
726
    
721
727
    if server_settings["servicename"] != "Mandos":
722
728
        syslogger.setFormatter(logging.Formatter\
751
757
            avahi.DBUS_INTERFACE_SERVER )
752
758
    # End of Avahi example code
753
759
    
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
 
    
762
760
    clients = Set()
763
761
    def remove_from_clients(client):
764
762
        clients.remove(client)
776
774
        sys.exit(1)
777
775
    
778
776
    if not debug:
 
777
        logger.removeHandler(console)
779
778
        daemon()
780
779
    
781
780
    pidfilename = "/var/run/mandos/mandos.pid"