/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: 2010-09-11 18:34:55 UTC
  • mfrom: (24.1.162 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20100911183455-kmzttvbywdbfbepm
Merge from Björn.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
165
165
                                u' %%(levelname)s: %%(message)s'
166
166
                                % self.name))
167
167
        self.remove()
168
 
        self.add()
 
168
        try:
 
169
            self.add()
 
170
        except dbus.exceptions.DBusException, error:
 
171
            logger.critical(u"DBusException: %s", error)
 
172
            self.cleanup()
 
173
            os._exit(1)
169
174
        self.rename_count += 1
170
175
    def remove(self):
171
176
        """Derived from the Avahi example code"""
1728
1733
    tcp_server = MandosServer((server_settings[u"address"],
1729
1734
                               server_settings[u"port"]),
1730
1735
                              ClientHandler,
1731
 
                              interface=server_settings[u"interface"],
 
1736
                              interface=(server_settings[u"interface"]
 
1737
                                         or None),
1732
1738
                              use_ipv6=use_ipv6,
1733
1739
                              gnutls_priority=
1734
1740
                              server_settings[u"priority"],