openstack/zaqar
Code Issues Proposed changes

Merge "Fix improperly LOG using in Zaqar"

Browse Source
This commit is contained in:
Jenkins 2016-02-14 22:39:47 +00:00 committed by Gerrit Code Review
commit 2bc8de46fe
7 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zaqar/bootstrap.py
View File

@ -28,6 +28,8 @@ from zaqar.storage import utils as storage_utils
from zaqar.transport import base from zaqar.transport import base
from zaqar.transport import validation from zaqar.transport import validation
from zaqar.i18n import _LE
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -123,8 +125,8 @@ class Bootstrap(object):
return mgr.driver return mgr.driver
except RuntimeError as exc: except RuntimeError as exc:
LOG.exception(exc) LOG.exception(exc)
LOG.error(u'Failed to load transport driver zaqar.transport.' LOG.error(_LE(u'Failed to load transport driver zaqar.transport.'
u'%(driver)s with args %(args)s', u'%(driver)s with args %(args)s'),
{'driver': transport_name, 'args': args}) {'driver': transport_name, 'args': args})
raise errors.InvalidDriver(exc) raise errors.InvalidDriver(exc)

3
zaqar/notification/notifier.py
View File

@ -19,6 +19,7 @@ import futurist
from oslo_log import log as logging from oslo_log import log as logging
from six.moves import urllib_parse from six.moves import urllib_parse
from zaqar.i18n import _LE
from zaqar.storage import pooling from zaqar.storage import pooling
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -51,4 +52,4 @@ class NotifierDriver(object):
self.executor.submit(mgr.driver.execute, sub, messages, self.executor.submit(mgr.driver.execute, sub, messages,
conf=data_driver.conf) conf=data_driver.conf)
else: else:
LOG.error('Failed to get subscription controller.') LOG.error(_LE('Failed to get subscription controller.'))

7
zaqar/notification/task/mailto.py
View File

@ -43,8 +43,7 @@ class MailtoTask(object):
msg["subject"] = params.get('subject', subject_opt) msg["subject"] = params.get('subject', subject_opt)
p.communicate(msg.as_string()) p.communicate(msg.as_string())
except OSError as err: except OSError as err:
LOG.error(_LE('Failed to create process for sendmail, ' LOG.exception(_LE('Failed to create process for sendmail, '
'because %s') % str(err)) 'because %s.') % str(err))
except Exception as exc: except Exception as exc:
LOG.exception(_LE('Failed to send email')) LOG.exception(_LE('Failed to send email because %s.') % str(exc))
LOG.exception(exc)

4
zaqar/notification/task/webhook.py
View File

@ -17,6 +17,8 @@ import json
from oslo_log import log as logging from oslo_log import log as logging
import requests import requests
from zaqar.i18n import _LE
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -29,4 +31,4 @@ class WebhookTask(object):
data=json.dumps(msg), data=json.dumps(msg),
headers={'Content-Type': 'application/json'}) headers={'Content-Type': 'application/json'})
except Exception as e: except Exception as e:
LOG.error(e) LOG.exception(_LE('webhook task got exception: %s.') % str(e))

7
zaqar/storage/mongodb/utils.py
View File

@ -28,7 +28,8 @@ from oslo_log import log as logging
from oslo_utils import timeutils from oslo_utils import timeutils
from pymongo import errors from pymongo import errors
from zaqar.i18n import _ from zaqar.i18n import _LE
from zaqar.i18n import _LW
from zaqar.storage import errors as storage_errors from zaqar.storage import errors as storage_errors
@ -287,13 +288,13 @@ def retries_on_autoreconnect(func):
break break
except errors.AutoReconnect as ex: except errors.AutoReconnect as ex:
LOG.warning(_(u'Caught AutoReconnect, retrying the ' LOG.warning(_LW(u'Caught AutoReconnect, retrying the '
'call to {0}').format(func)) 'call to {0}').format(func))
last_ex = ex last_ex = ex
time.sleep(sleep_sec * (2 ** attempt)) time.sleep(sleep_sec * (2 ** attempt))
else: else:
LOG.error(_(u'Caught AutoReconnect, maximum attempts ' LOG.error(_LE(u'Caught AutoReconnect, maximum attempts '
'to {0} exceeded.').format(func)) 'to {0} exceeded.').format(func))
raise last_ex raise last_ex

7
zaqar/storage/redis/utils.py
View File

@ -23,7 +23,8 @@ from oslo_utils import encodeutils
import redis import redis
import six import six
from zaqar.i18n import _ from zaqar.i18n import _LE
from zaqar.i18n import _LW
from zaqar.storage import errors from zaqar.storage import errors
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -210,12 +211,12 @@ def retries_on_connection_error(func):
# MasterNotFoundError. # MasterNotFoundError.
ex = sys.exc_info()[1] ex = sys.exc_info()[1]
LOG.warning(_(u'Caught ConnectionError, retrying the ' LOG.warning(_LW(u'Caught ConnectionError, retrying the '
'call to {0}').format(func)) 'call to {0}').format(func))
time.sleep(sleep_sec * (2 ** attempt)) time.sleep(sleep_sec * (2 ** attempt))
else: else:
LOG.error(_(u'Caught ConnectionError, maximum attempts ' LOG.error(_LE(u'Caught ConnectionError, maximum attempts '
'to {0} exceeded.').format(func)) 'to {0} exceeded.').format(func))
raise ex raise ex

5
zaqar/storage/utils.py
View File

@ -21,6 +21,7 @@ from stevedore import driver
from zaqar.common import errors from zaqar.common import errors
from zaqar.common import utils from zaqar.common import utils
from zaqar.i18n import _LE
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -140,8 +141,8 @@ def load_storage_driver(conf, cache, storage_type=None,
return mgr.driver return mgr.driver
except Exception as exc: except Exception as exc:
LOG.error('Failed to load "{}" driver for "{}"'.format(driver_type, LOG.error(_LE('Failed to load "{}" driver for "{}"').format(
storage_type)) driver_type, storage_type))
LOG.exception(exc) LOG.exception(exc)
raise errors.InvalidDriver(exc) raise errors.InvalidDriver(exc)