Merge remote-tracking branch 'origin/v1.9'

This commit is contained in:
Adolfo Gómez García 2015-10-16 16:59:14 +02:00
commit 407b0ebf55

View File

@ -44,7 +44,7 @@ import threading
import time import time
import logging import logging
__updated__ = '2015-10-15' __updated__ = '2015-10-16'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -141,6 +141,10 @@ class DelayedTaskRunner(object):
break break
except Exception, e: except Exception, e:
logger.info('Exception inserting a delayed task {0}: {1}'.format(str(e.__class__), e)) logger.info('Exception inserting a delayed task {0}: {1}'.format(str(e.__class__), e))
try:
connection.close()
except Exception:
logger.exception('Closing db connection at insert')
time.sleep(1) # Wait a bit before next try... time.sleep(1) # Wait a bit before next try...
# If retries == 0, this is a big error # If retries == 0, this is a big error
if retries == 0: if retries == 0: