Merge pull request #518 from jzelinskie/fixmysqlssl

move UseThenDisconnect into queueworker

data/queue.py

@@ -1,7 +1,6 @@
 from datetime import datetime, timedelta
 
-from app import app
-from data.database import QueueItem, db, db_for_update, UseThenDisconnect
+from data.database import QueueItem, db, db_for_update
 from util.morecollections import AttrDict
 
 
@@ -69,7 +68,6 @@ class WorkQueue(object):
     return db_for_update(QueueItem.select().where(QueueItem.id == queue_id)).get()
 
   def get_metrics(self, require_transaction=True):
-    with UseThenDisconnect(app.config):
     guard = self._transaction_factory(db) if require_transaction else NoopWith()
     with guard:
       now = datetime.utcnow()

workers/queueworker.py

@@ -8,8 +8,11 @@ from datetime import datetime, timedelta
 from threading import Thread
 from time import sleep
 
+from app import app
+
 from data.model import db
 from data.queue import WorkQueue
+from data.database import UseThenDisconnect
 
 from workers.worker import Worker
 
@@ -123,6 +126,7 @@ class QueueWorker(Worker):
       logger.debug('No more work.')
 
   def update_queue_metrics(self):
+    with UseThenDisconnect(app.config):
       self._queue.update_metrics()
 
   def mark_current_incomplete(self, restore_retry=False):