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

7 files changed, 29 insertions, 20 deletions

diff --git a/myrpki/yamltest.py b/myrpki/yamltest.py
index 9e349a0f..8b2a8378 100644
--- a/myrpki/yamltest.py
+++ b/myrpki/yamltest.py
@@ -161,6 +161,7 @@ class allocation_db(list):
     """
     env = { "PATH"           : os.environ["PATH"],
             "BPKI_DIRECTORY" : self.root.path("bpki.myirbe"),
+            "OPENSSL_CONF"   : "/dev/null",
             "RANDFILE"       : ".OpenSSL.whines.unless.I.set.this" }
     cwd = self.root.path()
     return lambda *args: subprocess.check_call((prog_openssl,) + args, cwd = cwd, env = env)
@@ -498,7 +499,7 @@ class allocation(object):
     representing the running daemon.
     """
     basename = os.path.basename(prog)
-    p = subprocess.Popen(("python", prog, "-c", self.path("myrpki.conf")),
+    p = subprocess.Popen(("python", prog, "-d", "-c", self.path("myrpki.conf")),
                          cwd = self.path(),
                          stdout = open(self.path(os.path.splitext(basename)[0] + ".log"), "w"),
                          stderr = subprocess.STDOUT)
diff --git a/rpkid/irdbd.py b/rpkid/irdbd.py
index 26be6f56..13f3d103 100644
--- a/rpkid/irdbd.py
+++ b/rpkid/irdbd.py
@@ -167,20 +167,22 @@ def handler(query, path, cb):
 os.environ["TZ"] = "UTC"
 time.tzset()
 
-rpki.log.init("irdbd")
-
 cfg_file = "irdbd.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"):
     cfg_file = a
+  elif o in ("-d", "--debug"):
+    rpki.log.use_syslog = False
 if argv:
   raise RuntimeError, "Unexpected arguments %s" % argv
 
+rpki.log.init("irdbd")
+
 cfg = rpki.config.parser(cfg_file, "irdbd")
 
 startup_msg = cfg.get("startup-message", "")
diff --git a/rpkid/pubd.py b/rpkid/pubd.py
index ec6f3fcf..82f3fb93 100644
--- a/rpkid/pubd.py
+++ b/rpkid/pubd.py
@@ -150,23 +150,25 @@ class pubd_context(object):
 os.environ["TZ"] = "UTC"
 time.tzset()
 
-rpki.log.init("pubd")
-
 cfg_file = "pubd.conf"
 profile = False
 
-opts, argv = getopt.getopt(sys.argv[1:], "c:hp:?", ["config=", "help"])
+opts, argv = getopt.getopt(sys.argv[1:], "c:dhp:?", ["config=", "debug", "help"])
 for o, a in opts:
   if o in ("-h", "--help", "-?"):
     print __doc__
     sys.exit(0)
   elif o in ("-c", "--config"):
     cfg_file = a
+  elif o in ("-d", "--debug"):
+    rpki.log.use_syslog = False
   elif o in ("-p", "--profile"):
     profile = a
 if argv:
   raise RuntimeError, "Unexpected arguments %s" % argv
 
+rpki.log.init("pubd")
+
 def main():
 
   cfg = rpki.config.parser(cfg_file, "pubd")
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"))
diff --git a/rpkid/rpki/log.py b/rpkid/rpki/log.py
index d3eb41cd..4edf501f 100644
--- a/rpkid/rpki/log.py
+++ b/rpkid/rpki/log.py
@@ -43,12 +43,12 @@ enable_trace = False
 ## @var use_syslog
 # Whether to use syslog
 
-use_syslog = False
+use_syslog = True
 
 tag = ""
 pid = 0
 
-def init(ident = "rpki", flags = syslog.LOG_PID | syslog.LOG_PERROR, facility = syslog.LOG_DAEMON):
+def init(ident = "rpki", flags = syslog.LOG_PID, facility = syslog.LOG_DAEMON):
   """
   Initialize logging system.
   """
diff --git a/rpkid/rpkid.py b/rpkid/rpkid.py
index 98381600..e441598a 100644
--- a/rpkid/rpkid.py
+++ b/rpkid/rpkid.py
@@ -46,16 +46,16 @@ import rpki.rpki_engine
 os.environ["TZ"] = "UTC"
 time.tzset()
 
-rpki.log.init("rpkid")
-
 cfg_file = "rpkid.conf"
 profile = None
 
-opts, argv = getopt.getopt(sys.argv[1:], "c:hp:?", ["config=", "help", "profile="])
+opts, argv = getopt.getopt(sys.argv[1:], "c:dhp:?", ["config=", "debug", "help", "profile="])
 for o, a in opts:
   if o in ("-h", "--help", "-?"):
     print __doc__
     sys.exit(0)
+  elif o in ("-d", "--debug"):
+    rpki.log.use_syslog = False
   elif o in ("-c", "--config"):
     cfg_file = a
   elif o in ("-p", "--profile"):
@@ -63,6 +63,8 @@ for o, a in opts:
 if argv:
   raise RuntimeError, "Unexpected arguments %s" % argv
 
+rpki.log.init("rpkid")
+
 def main():
 
   cfg = rpki.config.parser(cfg_file, "rpkid")
diff --git a/rpkid/testbed.py b/rpkid/testbed.py
index 3554c577..866ff1a1 100644
--- a/rpkid/testbed.py
+++ b/rpkid/testbed.py
@@ -218,10 +218,10 @@ def main():
   try:
 
     rpki.log.info("Starting rootd")
-    rootd_process = subprocess.Popen((prog_python, prog_rootd, "-c", rootd_name + ".conf"))
+    rootd_process = subprocess.Popen((prog_python, prog_rootd, "-d", "-c", rootd_name + ".conf"))
 
     rpki.log.info("Starting pubd")
-    pubd_process = subprocess.Popen((prog_python, prog_pubd, "-c", pubd_name + ".conf") + (("-p", pubd_name + ".prof") if profile else ()))
+    pubd_process = subprocess.Popen((prog_python, prog_pubd, "-d", "-c", pubd_name + ".conf") + (("-p", pubd_name + ".prof") if profile else ()))
 
     rpki.log.info("Starting rsyncd")
     rsyncd_process = subprocess.Popen((prog_rsyncd, "--daemon", "--no-detach", "--config", rsyncd_name + ".conf"))
@@ -744,8 +744,8 @@ class allocation(object):
     Run daemons for this entity.
     """
     rpki.log.info("Running daemons for %s" % self.name)
-    self.rpkid_process = subprocess.Popen((prog_python, prog_rpkid, "-c", self.name + ".conf") + (("-p", self.name + ".prof") if profile else ()))
-    self.irdbd_process = subprocess.Popen((prog_python, prog_irdbd, "-c", self.name + ".conf"))
+    self.rpkid_process = subprocess.Popen((prog_python, prog_rpkid, "-d", "-c", self.name + ".conf") + (("-p", self.name + ".prof") if profile else ()))
+    self.irdbd_process = subprocess.Popen((prog_python, prog_irdbd, "-d", "-c", self.name + ".conf"))
 
   def kill_daemons(self):
     """