summaryrefslogtreecommitdiff
path: root/cinder/coordination.py
diff options
context:
space:
mode:
authorSean McGinnis <sean_mcginnis@dell.com>2017-03-09 15:49:01 -0600
committerSean McGinnis <sean.mcginnis@gmail.com>2017-03-19 14:59:57 +0000
commita55a6b5c717c0802288ab802a8fbff287a4b6b66 (patch)
treed9feb07094186270d32a8a9a4e76659a9bbf3816 /cinder/coordination.py
parent3a6c184d52f897651fcf93a3a9aa3a3bdd8c439c (diff)
downloadcinder-a55a6b5c717c0802288ab802a8fbff287a4b6b66.tar.gz
Remove log translations
Log messages are no longer being translated. This removes all use of the _LE, _LI, and _LW translation markers to simplify logging and to avoid confusion with new contributions. See: http://lists.openstack.org/pipermail/openstack-i18n/2016-November/002574.html http://lists.openstack.org/pipermail/openstack-dev/2017-March/113365.html Change-Id: I4c96f3590d46205c45d12ee4ead8c208e11c52c5
Diffstat (limited to 'cinder/coordination.py')
-rw-r--r--cinder/coordination.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/cinder/coordination.py b/cinder/coordination.py
index b4dc212fd..8023de949 100644
--- a/cinder/coordination.py
+++ b/cinder/coordination.py
@@ -32,7 +32,7 @@ from tooz import coordination
from tooz import locking
from cinder import exception
-from cinder.i18n import _, _LE, _LI, _LW
+from cinder.i18n import _
LOG = log.getLogger(__name__)
@@ -94,9 +94,9 @@ class Coordinator(object):
self._ev = eventlet.spawn(
lambda: tpool.execute(self.heartbeat))
except coordination.ToozError:
- LOG.exception(_LE('Error starting coordination backend.'))
+ LOG.exception('Error starting coordination backend.')
raise
- LOG.info(_LI('Coordination backend started successfully.'))
+ LOG.info('Coordination backend started successfully.')
def stop(self):
"""Disconnect from coordination backend and stop heartbeat."""
@@ -154,17 +154,17 @@ class Coordinator(object):
self.coordinator.heartbeat()
return True
except coordination.ToozConnectionError:
- LOG.exception(_LE('Connection error while sending a heartbeat '
- 'to coordination backend.'))
+ LOG.exception('Connection error while sending a heartbeat '
+ 'to coordination backend.')
raise
except coordination.ToozError:
- LOG.exception(_LE('Error sending a heartbeat to coordination '
- 'backend.'))
+ LOG.exception('Error sending a heartbeat to coordination '
+ 'backend.')
return False
def _reconnect(self):
"""Reconnect with jittered exponential backoff increase."""
- LOG.info(_LI('Reconnecting to coordination backend.'))
+ LOG.info('Reconnecting to coordination backend.')
cap = cfg.CONF.coordination.max_reconnect_backoff
backoff = base = cfg.CONF.coordination.initial_reconnect_backoff
for attempt in itertools.count(1):
@@ -173,11 +173,11 @@ class Coordinator(object):
break
except coordination.ToozError:
backoff = min(cap, random.uniform(base, backoff * 3))
- msg = _LW('Reconnect attempt %(attempt)s failed. '
- 'Next try in %(backoff).2fs.')
+ msg = ('Reconnect attempt %(attempt)s failed. '
+ 'Next try in %(backoff).2fs.')
LOG.warning(msg, {'attempt': attempt, 'backoff': backoff})
self._dead.wait(backoff)
- LOG.info(_LI('Reconnected to coordination backend.'))
+ LOG.info('Reconnected to coordination backend.')
COORDINATOR = Coordinator(prefix='cinder-')