/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: 2009-11-03 00:12:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091103001235-op9jfvtx6xvxch3h
* README (FAQ): Fix typo.
* mandos (main): Try to always do cleanup() before exit, since
                 otherwise the D-Bus bus name gets unregistered first.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1716
1716
            service.activate()
1717
1717
        except dbus.exceptions.DBusException, error:
1718
1718
            logger.critical(u"DBusException: %s", error)
 
1719
            cleanup()
1719
1720
            sys.exit(1)
1720
1721
        # End of Avahi example code
1721
1722
        
1728
1729
        main_loop.run()
1729
1730
    except AvahiError, error:
1730
1731
        logger.critical(u"AvahiError: %s", error)
 
1732
        cleanup()
1731
1733
        sys.exit(1)
1732
1734
    except KeyboardInterrupt:
1733
1735
        if debug:
1734
1736
            print >> sys.stderr
1735
1737
        logger.debug(u"Server received KeyboardInterrupt")
1736
1738
    logger.debug(u"Server exiting")
 
1739
    # Must run before the D-Bus bus name gets deregistered
 
1740
    cleanup()
1737
1741
 
1738
1742
if __name__ == '__main__':
1739
1743
    main()