/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-05 02:12:57 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091105021257-l2b5nb1v4pc2tupw
* mandos (ClientDBus.disable): Bug fix: complete rename of "log" and
                               "signal" to "quiet".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
325
325
        self.checker_initiator_tag = (gobject.timeout_add
326
326
                                      (self.interval_milliseconds(),
327
327
                                       self.start_checker))
328
 
        # Also start a new checker *right now*.
329
 
        self.start_checker()
330
328
        # Schedule a disable() when 'timeout' has passed
331
329
        self.disable_initiator_tag = (gobject.timeout_add
332
330
                                   (self.timeout_milliseconds(),
333
331
                                    self.disable))
334
332
        self.enabled = True
 
333
        # Also start a new checker *right now*.
 
334
        self.start_checker()
335
335
    
336
 
    def disable(self):
 
336
    def disable(self, quiet=True):
337
337
        """Disable this client."""
338
338
        if not getattr(self, "enabled", False):
339
339
            return False
340
 
        logger.info(u"Disabling client %s", self.name)
 
340
        if not quiet:
 
341
            logger.info(u"Disabling client %s", self.name)
341
342
        if getattr(self, u"disable_initiator_tag", False):
342
343
            gobject.source_remove(self.disable_initiator_tag)
343
344
            self.disable_initiator_tag = None
467
468
        logger.debug(u"Stopping checker for %(name)s", vars(self))
468
469
        try:
469
470
            os.kill(self.checker.pid, signal.SIGTERM)
470
 
            #os.sleep(0.5)
 
471
            #time.sleep(0.5)
471
472
            #if self.checker.poll() is None:
472
473
            #    os.kill(self.checker.pid, signal.SIGKILL)
473
474
        except OSError, error:
705
706
                                       variant_level=1))
706
707
        return r
707
708
    
708
 
    def disable(self, signal = True):
 
709
    def disable(self, quiet = False):
709
710
        oldstate = getattr(self, u"enabled", False)
710
 
        r = Client.disable(self)
711
 
        if signal and oldstate != self.enabled:
 
711
        r = Client.disable(self, quiet=quiet)
 
712
        if not quiet and oldstate != self.enabled:
712
713
            # Emit D-Bus signal
713
714
            self.PropertyChanged(dbus.String(u"enabled"),
714
715
                                 dbus.Boolean(False, variant_level=1))
1345
1346
            elif suffix == u"w":
1346
1347
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1347
1348
            else:
1348
 
                raise ValueError
1349
 
        except (ValueError, IndexError):
1350
 
            raise ValueError
 
1349
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1350
        except (ValueError, IndexError), e:
 
1351
            raise ValueError(e.message)
1351
1352
        timevalue += delta
1352
1353
    return timevalue
1353
1354
 
1566
1567
    bus = dbus.SystemBus()
1567
1568
    # End of Avahi example code
1568
1569
    if use_dbus:
1569
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
1570
        try:
 
1571
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1572
                                            bus, do_not_queue=True)
 
1573
        except dbus.exceptions.NameExistsException, e:
 
1574
            logger.error(unicode(e) + u", disabling D-Bus")
 
1575
            use_dbus = False
 
1576
            server_settings[u"use_dbus"] = False
 
1577
            tcp_server.use_dbus = False
1570
1578
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1571
1579
    service = AvahiService(name = server_settings[u"servicename"],
1572
1580
                           servicetype = u"_mandos._tcp",
1610
1618
        pass
1611
1619
    del pidfilename
1612
1620
    
1613
 
    def cleanup():
1614
 
        "Cleanup function; run on exit"
1615
 
        service.cleanup()
1616
 
        
1617
 
        while tcp_server.clients:
1618
 
            client = tcp_server.clients.pop()
1619
 
            client.disable_hook = None
1620
 
            client.disable()
1621
 
    
1622
 
    atexit.register(cleanup)
1623
 
    
1624
1621
    if not debug:
1625
1622
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1626
1623
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1671
1668
                        tcp_server.clients.remove(c)
1672
1669
                        c.remove_from_connection()
1673
1670
                        # Don't signal anything except ClientRemoved
1674
 
                        c.disable(signal=False)
 
1671
                        c.disable(quiet=True)
1675
1672
                        # Emit D-Bus signal
1676
1673
                        self.ClientRemoved(object_path, c.name)
1677
1674
                        return
1678
 
                raise KeyError
 
1675
                raise KeyError(object_path)
1679
1676
            
1680
1677
            del _interface
1681
1678
        
1682
1679
        mandos_dbus_service = MandosDBusService()
1683
1680
    
 
1681
    def cleanup():
 
1682
        "Cleanup function; run on exit"
 
1683
        service.cleanup()
 
1684
        
 
1685
        while tcp_server.clients:
 
1686
            client = tcp_server.clients.pop()
 
1687
            if use_dbus:
 
1688
                client.remove_from_connection()
 
1689
            client.disable_hook = None
 
1690
            # Don't signal anything except ClientRemoved
 
1691
            client.disable(quiet=True)
 
1692
            if use_dbus:
 
1693
                # Emit D-Bus signal
 
1694
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
1695
                                                  client.name)
 
1696
    
 
1697
    atexit.register(cleanup)
 
1698
    
1684
1699
    for client in tcp_server.clients:
1685
1700
        if use_dbus:
1686
1701
            # Emit D-Bus signal
1709
1724
            service.activate()
1710
1725
        except dbus.exceptions.DBusException, error:
1711
1726
            logger.critical(u"DBusException: %s", error)
 
1727
            cleanup()
1712
1728
            sys.exit(1)
1713
1729
        # End of Avahi example code
1714
1730
        
1721
1737
        main_loop.run()
1722
1738
    except AvahiError, error:
1723
1739
        logger.critical(u"AvahiError: %s", error)
 
1740
        cleanup()
1724
1741
        sys.exit(1)
1725
1742
    except KeyboardInterrupt:
1726
1743
        if debug:
1727
1744
            print >> sys.stderr
1728
1745
        logger.debug(u"Server received KeyboardInterrupt")
1729
1746
    logger.debug(u"Server exiting")
 
1747
    # Must run before the D-Bus bus name gets deregistered
 
1748
    cleanup()
1730
1749
 
1731
1750
if __name__ == '__main__':
1732
1751
    main()