4 files changed, 9 insertions, 16 deletions
diff --git a/rpki/cli.py b/rpki/cli.py
index fa76155b..e75b8430 100644
--- a/rpki/cli.py
+++ b/rpki/cli.py
@@ -59,13 +59,6 @@ class Cmd(cmd.Cmd):
 
   last_command_failed = False
 
-  def __init__(self, argv = None):
-    cmd.Cmd.__init__(self)
-    if argv:
-      self.onecmd(" ".join(argv))
-    else:
-      self.cmdloop_with_history()
-
   def onecmd(self, line):
     """
     Wrap error handling around cmd.Cmd.onecmd().  Might want to do
diff --git a/rpki/http.py b/rpki/http.py
index 4b9d1eca..7144918c 100644
--- a/rpki/http.py
+++ b/rpki/http.py
@@ -610,14 +610,16 @@ class http_listener(asyncore.dispatcher):
     stream for it and pass along all of our handler data.
     """
     try:
-      s, c = self.accept()
-      self.logger.debug("Accepting connection from %s", addr_to_string(c))
-      http_server(sock = s, handlers = self.handlers)
+      res =  self.accept()
+      if res is None:
+        raise
+      sock, addr = res
+      self.logger.debug("Accepting connection from %s", addr_to_string(addr))
+      http_server(sock = sock, handlers = self.handlers)
     except (rpki.async.ExitNow, SystemExit):
       raise
     except Exception:
-      self.logger.exception("Unable to accept connection: %s")
-      self.handle_error()
+      self.logger.exception("Unable to accept connection")
 
   def handle_error(self):
     """
diff --git a/rpki/irdb/zookeeper.py b/rpki/irdb/zookeeper.py
index cd996c7e..6b762b0f 100644
--- a/rpki/irdb/zookeeper.py
+++ b/rpki/irdb/zookeeper.py
@@ -26,14 +26,11 @@ import os
 import copy
 import types
 import rpki.config
-import rpki.cli
 import rpki.sundial
-import rpki.log
 import rpki.oids
 import rpki.http
 import rpki.resource_set
 import rpki.relaxng
-import rpki.exceptions
 import rpki.left_right
 import rpki.x509
 import rpki.async
diff --git a/rpki/rpkic.py b/rpki/rpkic.py
index d37021a8..d7b76c51 100644
--- a/rpki/rpkic.py
+++ b/rpki/rpkic.py
@@ -83,6 +83,7 @@ class main(Cmd):
 
   def __init__(self):
 
+    Cmd.__init__(self)
     os.environ["TZ"] = "UTC"
     time.tzset()
 
@@ -115,7 +116,7 @@ class main(Cmd):
     rpki.log.init("rpkic")
     self.read_config()
     if self.interactive:
-      Cmd.__init__(self)
+      self.cmdloop_with_history()
     else:
       args.func(self, args)