Makefile to install & uninstall dbuscron added

[dbuscron] / dbuscron.py

diff --git a/dbuscron.py b/dbuscron.py
index 7a775e7..a2a17b3 100755 (executable)
--- a/dbuscron.py
+++ b/dbuscron.py
@@ -17,7 +17,7 @@ if __name__ == '__main__':
 
     from dbuscron import Logger, OptionsParser
 
-    options = OptionsParser('fvc:l:')
+    options = OptionsParser('fqvc:l:')
     daemon = not options.f
 
     logout = sys.stderr
@@ -25,7 +25,7 @@ if __name__ == '__main__':
         logout = open(options.l, 'wb')
 
     log = Logger(__name__, out=logout)
-    log.level = options.v + Logger.ERROR
+    log.level = options.v - options.q + Logger.WARNING
 
     if daemon:
         from dbuscron.daemonize import daemonize
@@ -38,14 +38,27 @@ if __name__ == '__main__':
 
     bus = DbusBus()
     commands = Commands()
+
     crontab = CrontabParser(options.c or '/etc/dbuscrontab')
 
-    for rule, cmd in crontab:
-        matcher = DbusRule(**rule)
-        command = Command(cmd)
-        matcher.register()
-        log.info('%s %s' % (matcher, command))
-        commands.add(matcher, command)
+    def load_config(parser):
+        for rule, cmd in parser:
+            matcher = DbusRule(**rule)
+            command = Command(cmd)
+            matcher.register()
+            log.info('%s %s' % (matcher, command))
+            commands.add(matcher, command)
+
+    load_config(crontab)
+
+    def reload_config_on_signal(sig_no, stack):
+        log.info('Signal #%d received: reloading config...' % (sig_no))
+        commands.clear()
+        load_config(crontab)
+        log.info('Done config reloading.')
+
+    import signal
+    signal.signal(signal.SIGHUP, reload_config_on_signal)
 
     commands.environ = crontab.environ
     bus.attach_handler(commands.handler)