First cut at replacing rpkid's HTTP and I/O system with Tornado. Not

quite working perfectly yet (cron is a bit wonky) but manages to
produce an initial set of ROAs without thowing any exceptions, and
code is already much cleaner than the old callback-based horror.

svn path=/branches/tk705/; revision=6139

1 files changed, 0 insertions, 42 deletions

diff --git a/rpki/config.py b/rpki/config.py
index 3234294c..99041259 100644
--- a/rpki/config.py
+++ b/rpki/config.py
@@ -205,9 +205,7 @@ class parser(object):
     """
 
     # pylint: disable=W0621
-    import rpki.http
     import rpki.x509
-    import rpki.async
     import rpki.log
     import rpki.daemonize
 
@@ -219,46 +217,11 @@ class parser(object):
         logger.warning("Could not process configure_logger line %r: %s", line, e)
 
     try:
-      rpki.http.want_persistent_client = self.getboolean("want_persistent_client")
-    except ConfigParser.NoOptionError:
-      pass
-
-    try:
-      rpki.http.want_persistent_server = self.getboolean("want_persistent_server")
-    except ConfigParser.NoOptionError:
-      pass
-
-    try:
-      rpki.http.use_adns = self.getboolean("use_adns")
-    except ConfigParser.NoOptionError:
-      pass
-
-    try:
-      rpki.http.enable_ipv6_clients = self.getboolean("enable_ipv6_clients")
-    except ConfigParser.NoOptionError:
-      pass
-
-    try:
-      rpki.http.enable_ipv6_servers = self.getboolean("enable_ipv6_servers")
-    except ConfigParser.NoOptionError:
-      pass
-
-    try:
       rpki.x509.CMS_object.debug_cms_certs = self.getboolean("debug_cms_certs")
     except ConfigParser.NoOptionError:
       pass
 
     try:
-      rpki.async.timer.gc_debug = self.getboolean("gc_debug")
-    except ConfigParser.NoOptionError:
-      pass
-
-    try:
-      rpki.async.timer.run_debug = self.getboolean("timer_debug")
-    except ConfigParser.NoOptionError:
-      pass
-
-    try:
       rpki.x509.XML_CMS_object.dump_outbound_cms = rpki.x509.DeadDrop(self.get("dump_outbound_cms"))
     except OSError, e:
       logger.warning("Couldn't initialize mailbox %s: %s", self.get("dump_outbound_cms"), e)
@@ -283,11 +246,6 @@ class parser(object):
       pass
 
     try:
-      rpki.async.gc_summary(self.getint("gc_summary"), self.getint("gc_summary_threshold", 0))
-    except ConfigParser.NoOptionError:
-      pass
-
-    try:
       rpki.log.enable_tracebacks = self.getboolean("enable_tracebacks")
     except ConfigParser.NoOptionError:
       pass