Change logging default back to using syslog; add -d/--debug switch to

all daemons to support logging to stderr.

svn path=/myrpki/yamltest.py; revision=2910

1 files changed, 6 insertions, 4 deletions

diff --git a/rpkid/rootd.py b/rpkid/rootd.py
index 2a88a187..e9061097 100644
--- a/rpkid/rootd.py
+++ b/rpkid/rootd.py
@@ -265,20 +265,22 @@ def up_down_handler(query, path, cb):
 os.environ["TZ"] = "UTC"
 time.tzset()
 
-rpki.log.init("rootd")
-
 cfg_file = "rootd.conf"
 
-opts, argv = getopt.getopt(sys.argv[1:], "c:h?", ["config=", "help"])
+opts, argv = getopt.getopt(sys.argv[1:], "c:dh?", ["config=", "debug", "help"])
 for o, a in opts:
   if o in ("-h", "--help", "-?"):
     print __doc__
     sys.exit(0)
-  if o in ("-c", "--config"):
+  elif o in ("-c", "--config"):
     cfg_file = a
+  elif o in ("-d", "--debug"):
+    rpki.log.use_syslog = False
 if argv:
   raise RuntimeError, "Unexpected arguments %s" % argv
 
+rpki.log.init("rootd")
+
 cfg = rpki.config.parser(cfg_file, "rootd")
 
 bpki_ta                 = rpki.x509.X509(Auto_file = cfg.get("bpki-ta"))