Cleanup

svn path=/rpkid/rpki/rpki_engine.py; revision=2645

4 files changed, 16 insertions, 13 deletions

diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py
index 02108e8a..b7b0c5e0 100644
--- a/rpkid/rpki/rpki_engine.py
+++ b/rpkid/rpki/rpki_engine.py
@@ -58,24 +58,24 @@ class rpkid_context(object):
 
     self.publication_kludge_base = cfg.get("publication-kludge-base", "publication/")
 
-    self.use_internal_clock = cfg.getboolean("use-internal-clock", True)
+    self.use_internal_cron = cfg.getboolean("use-internal-cron", True)
 
     self.initial_delay = random.randint(cfg.getint("initial-delay-min", 10),
                                         cfg.getint("initial-delay-max", 120))
     
     self.cron_period = cfg.getint("cron-period", 120) # Should be much longer in production
 
-  def start_clock(self):
+  def start_cron(self):
     """
-    Start rpkid's internal clock.
+    Start clock for rpkid's internal cron process.
     """
 
-    if self.use_internal_clock:
+    if self.use_internal_cron:
       when = rpki.sundial.now() + rpki.sundial.timedelta(seconds = self.initial_delay)
       rpki.log.debug("Scheduling initial cron pass at %s" % when)
       rpki.async.timer(handler = self.cron).set(when)
     else:
-      rpki.log.debug("Not using internal clock, start_clock() call ignored")
+      rpki.log.debug("Not using internal clock, start_cron() call ignored")
 
   def irdb_query(self, q_pdu, callback, errback):
     """
@@ -230,7 +230,7 @@ class rpkid_context(object):
 
     def done():
       self.sql.sweep()
-      if self.use_internal_clock:
+      if self.use_internal_cron:
         sched()
       else:
         cb()
@@ -240,7 +240,7 @@ class rpkid_context(object):
     except (rpki.async.ExitNow, SystemExit):
       raise
     except Exception, data:
-      if self.use_internal_clock:
+      if self.use_internal_cron:
         rpki.log.traceback()
         sched()
       else:
@@ -253,8 +253,8 @@ class rpkid_context(object):
     uses it.
     """
 
-    if self.use_internal_clock:
-      cb(500, "Running on internal clock")
+    if self.use_internal_cron:
+      cb(500, "Running cron internally")
     else:
       self.cron(lambda: cb(200, "OK"))
 
diff --git a/rpkid/rpkid.py b/rpkid/rpkid.py
index 34ef5d80..98381600 100755
--- a/rpkid/rpkid.py
+++ b/rpkid/rpkid.py
@@ -76,7 +76,7 @@ def main():
 
   gctx = rpki.rpki_engine.rpkid_context(cfg)
 
-  gctx.start_clock()
+  gctx.start_cron()
 
   rpki.https.server(host                       = gctx.https_server_host,
                     port                       = gctx.https_server_port,
diff --git a/rpkid/testbed.py b/rpkid/testbed.py
index 1659bc61..0b259333 100644
--- a/rpkid/testbed.py
+++ b/rpkid/testbed.py
@@ -554,6 +554,7 @@ class allocation(object):
 
     def done(e):
       if isinstance(e, Exception):
+        rpki.log.traceback()
         raise e
       cb()
 
@@ -570,6 +571,7 @@ class allocation(object):
 
     def done(e):
       if isinstance(e, Exception):
+        rpki.log.traceback()
         raise e
       cb()
 
@@ -1166,7 +1168,8 @@ def call_pubd(pdus, cb):
     cb(msg)
 
   def call_pubd_eb(e):
-    raise e
+    rpki.log.error("Problem calling pubd: %s" % e)
+    rpki.log.traceback()
 
   rpki.https.client(
     client_key   = pubd_irbe_key,
@@ -1343,7 +1346,7 @@ irdb-url        = https://localhost:%(irdb_port)d/
 server-host     = localhost
 server-port     = %(rpki_port)d
 
-use-internal-clock = false
+use-internal-cron = false
 '''
 
 rootd_fmt_1 = '''\
diff --git a/rpkid/testpoke.py b/rpkid/testpoke.py
index 3657fbe7..4ea4a7fb 100644
--- a/rpkid/testpoke.py
+++ b/rpkid/testpoke.py
@@ -141,7 +141,7 @@ dispatch = { "list" : do_list, "issue" : do_issue, "revoke" : do_revoke }
 
 def fail(e):
   if debug:
-    raise e
+    rpki.log.traceback()
   sys.exit("Testpoke failed: %s" % e)
 
 cms_ta         = get_PEM("cms-ca-cert", rpki.x509.X509)