Merge trunk.
This commit is contained in:
@@ -192,6 +192,7 @@ class AdapterConsumer(TopicConsumer):
|
||||
if msg_id:
|
||||
msg_reply(msg_id, rval, None)
|
||||
except Exception as e:
|
||||
logging.exception("Exception during message handling")
|
||||
if msg_id:
|
||||
msg_reply(msg_id, None, sys.exc_info())
|
||||
return
|
||||
|
||||
@@ -211,9 +211,10 @@ class Service(object):
|
||||
try:
|
||||
models.register_models()
|
||||
except OperationalError:
|
||||
logging.exception(_("Data store is unreachable."
|
||||
logging.exception(_("Data store %s is unreachable."
|
||||
" Trying again in %d seconds.") %
|
||||
FLAGS.sql_retry_interval)
|
||||
(FLAGS.sql_connection,
|
||||
FLAGS.sql_retry_interval))
|
||||
time.sleep(FLAGS.sql_retry_interval)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user