moved psycopg2 reference from scripting module to actual script using it

diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py
index ed7dfa03d5196cd3a0bfedc42378c301ac89b3df..77c1bec51499c28b95a7b56eca192d10c05b31dd 100644 (file)
--- a/python/skytools/scripting.py
+++ b/python/skytools/scripting.py
@@ -957,8 +957,7 @@ class DBScript(BaseScript):
         sql_retry_formula_a = self.cf.getint("sql_retry_formula_a", 1)
         sql_retry_formula_b = self.cf.getint("sql_retry_formula_b", 5)
         sql_retry_formula_cap = self.cf.getint("sql_retry_formula_cap", 60)
-        import psycopg2
-        elist = exceptions or (psycopg2.OperationalError,)
+        elist = exceptions or tuple([])
         stime = time.time()
         tried = 0
         dbc = None

diff --git a/scripts/simple_local_consumer.py b/scripts/simple_local_consumer.py
index 501770970ae78b90af8096615848ef5481e52cdf..e78ba0b45066d5ffcba4c9ba5b08dc4dcc93ee23 100755 (executable)
--- a/scripts/simple_local_consumer.py
+++ b/scripts/simple_local_consumer.py
@@ -22,12 +22,15 @@ Config::
 
 import sys
 
+import psycopg2
+
 import pkgloader
 pkgloader.require('skytools', '3.0')
 
 import pgq
 import skytools
 
+
 class SimpleLocalConsumer(pgq.LocalConsumer):
     __doc__ = __doc__
 
@@ -57,7 +60,8 @@ class SimpleLocalConsumer(pgq.LocalConsumer):
         payload['pgq.ev_extra4'] = ev.ev_extra4
 
         self.log.debug(self.dst_query, payload)
-        retries, curs = self.execute_with_retry('dst_db', self.dst_query, payload)
+        retries, curs = self.execute_with_retry('dst_db', self.dst_query, payload,
+                                                exceptions = (psycopg2.OperationalError,))
         if curs.statusmessage[:6] == 'SELECT':
             res = curs.fetchall()
             self.log.debug(res)