Add support for non-debugging global parameters.

svn path=/myrpki/myirbe.py; revision=2913

1 files changed, 16 insertions, 5 deletions

diff --git a/rpkid/rpki/config.py b/rpkid/rpki/config.py
index ce0f5b8e..8b337463 100644
--- a/rpkid/rpki/config.py
+++ b/rpkid/rpki/config.py
@@ -126,12 +126,13 @@ class parser(object):
     """
     return self._get_wrapper(self.cfg.getint, section, option, default)
 
-  def set_debugging_flags(self):
+  def set_global_flags(self):
     """
-    Consolidated control for all the little debugging controls
-    scattered through the libraries.  This doesn't really fit
-    anywhere, it's a method of the parser class because it operates on
-    the parser object and thus fits here less badly than anywhere else.
+    Consolidated control for all the little global control flags
+    scattered through the libraries.  This isn't a particularly good
+    place for this function to live, but it has to live somewhere and
+    making it a method of the config parser from which it gets all of
+    its data is less silly than the available alternatives.
     """
 
     import rpki.https, rpki.x509, rpki.sql, rpki.async
@@ -147,6 +148,16 @@ class parser(object):
       pass
 
     try:
+      rpki.https.want_persistent_client = self.getboolean("want_persistent_client")
+    except ConfigParser.NoOptionError:
+      pass
+
+    try:
+      rpki.https.want_persistent_server = self.getboolean("want_persistent_server")
+    except ConfigParser.NoOptionError:
+      pass
+
+    try:
       rpki.x509.CMS_object.debug_cms_certs = self.getboolean("debug_cms_certs")
     except ConfigParser.NoOptionError:
       pass