Clean up TLS certificate handling and a lot of debugging code.

svn path=/rpkid/cronjob.py; revision=1778

1 files changed, 11 insertions, 2 deletions

diff --git a/rpkid/rpki/sql.py b/rpkid/rpki/sql.py
index 2aa2ed49..791bc7d8 100644
--- a/rpkid/rpki/sql.py
+++ b/rpkid/rpki/sql.py
@@ -54,12 +54,19 @@ class sql_persistant(object):
 
   ## @var sql_in_db
   # Whether this object is already in SQL or not.
+
   sql_in_db = False
 
   ## @var sql_deleted
   # Whether our cached copy of this object has been deleted.
+
   sql_deleted = False
 
+  ## @var sql_debug
+  # Enable logging of SQL actions
+
+  sql_debug = False
+
   @classmethod
   def sql_fetch(cls, gctx, id):
     """Fetch one object from SQL, based on its primary key.
@@ -105,11 +112,13 @@ class sql_persistant(object):
     """Fetch objects of this type matching an arbitrary SQL WHERE expression."""
     if where is None:
       assert args is None
-      rpki.log.debug("sql_fetch_where(%s)" % repr(cls.sql_template.select))
+      if cls.sql_debug:
+        rpki.log.debug("sql_fetch_where(%s)" % repr(cls.sql_template.select))
       gctx.cur.execute(cls.sql_template.select)
     else:
       query = cls.sql_template.select + " WHERE " + where
-      rpki.log.debug("sql_fetch_where(%s, %s)" % (repr(query), repr(args)))
+      if cls.sql_debug:
+        rpki.log.debug("sql_fetch_where(%s, %s)" % (repr(query), repr(args)))
       gctx.cur.execute(query, args)
     results = []
     for row in gctx.cur.fetchall():