dbuscrontab utility: implemented -e/-l/-k actions, syntax checking

[dbuscron] / dbuscron.py

diff --git a/dbuscron.py b/dbuscron.py
index a2bfb17..610f07f 100755 (executable)
--- a/dbuscron.py
+++ b/dbuscron.py
@@ -15,7 +15,18 @@ import sys
 
 if __name__ == '__main__':
 
-    daemon = (len(sys.argv) < 2) or (sys.argv[1] != '-f')
+    from dbuscron import Logger, OptionsParser
+
+    options = OptionsParser('fvc:l:')
+    daemon = not options.f
+
+    logout = sys.stderr
+    if options.l:
+        logout = open(options.l, 'wb')
+
+    log = Logger(__name__, out=logout)
+    log.level = options.v + Logger.ERROR
+
     if daemon:
         from dbuscron.daemonize import daemonize
         daemonize(
@@ -23,17 +34,31 @@ if __name__ == '__main__':
             logfile='/var/log/dbuscron.log'
             )
 
-    from dbuscron import DbusBus, DbusRuleMatcher, Command, Commands, CrontabParser
+    from dbuscron import DbusBus, DbusRule, Command, Commands, CrontabParser
 
     bus = DbusBus()
     commands = Commands()
-    crontab = CrontabParser('/etc/dbuscrontab')
 
-    for rule, cmd in crontab:
-        matcher = DbusRuleMatcher(**rule)
-        command = Command(cmd)
-        matcher.register()
-        commands.add(matcher, command)
+    crontab = CrontabParser(options.c or '/etc/dbuscrontab')
+
+    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)