diff --git a/nova/hacking/checks.py b/nova/hacking/checks.py index 6dfe3b8f50..c0d1368adf 100644 --- a/nova/hacking/checks.py +++ b/nova/hacking/checks.py @@ -224,6 +224,10 @@ def no_translate_debug_logs(logical_line, filename): "nova/hacking", "nova/ipv6", "nova/keymgr", + "nova/objectstore", + "nova/pci", + "nova/rdp", + "nova/servicegroup", ] if max([name in filename for name in dirs]): if logical_line.startswith("LOG.debug(_("): diff --git a/nova/servicegroup/api.py b/nova/servicegroup/api.py index c9a72285d6..0016c5c53e 100644 --- a/nova/servicegroup/api.py +++ b/nova/servicegroup/api.py @@ -61,7 +61,7 @@ class API(object): ''' if not cls._driver: - LOG.debug(_('ServiceGroup driver defined as an instance of %s'), + LOG.debug('ServiceGroup driver defined as an instance of %s', str(CONF.servicegroup_driver)) driver_name = CONF.servicegroup_driver try: @@ -126,15 +126,15 @@ class API(object): def get_all(self, group_id): """Returns ALL members of the given group.""" - LOG.debug(_('Returns ALL members of the [%s] ' - 'ServiceGroup'), group_id) + LOG.debug('Returns ALL members of the [%s] ' + 'ServiceGroup', group_id) return self._driver.get_all(group_id) def get_one(self, group_id): """Returns one member of the given group. The strategy to select the member is decided by the driver (e.g. random or round-robin). """ - LOG.debug(_('Returns one member of the [%s] group'), group_id) + LOG.debug('Returns one member of the [%s] group', group_id) return self._driver.get_one(group_id) diff --git a/nova/servicegroup/drivers/db.py b/nova/servicegroup/drivers/db.py index 75479d86db..e7f74e7069 100644 --- a/nova/servicegroup/drivers/db.py +++ b/nova/servicegroup/drivers/db.py @@ -78,7 +78,7 @@ class DbDriver(api.ServiceGroupDriver): def get_all(self, group_id): """Returns ALL members of the given group """ - LOG.debug(_('DB_Driver: get_all members of the %s group') % group_id) + LOG.debug('DB_Driver: get_all members of the %s group', group_id) rs = [] ctxt = context.get_admin_context() services = self.conductor_api.service_get_all_by_topic(ctxt, group_id) diff --git a/nova/servicegroup/drivers/mc.py b/nova/servicegroup/drivers/mc.py index 2a5821cb2c..b39eb4c8ff 100644 --- a/nova/servicegroup/drivers/mc.py +++ b/nova/servicegroup/drivers/mc.py @@ -72,7 +72,7 @@ class MemcachedDriver(api.ServiceGroupDriver): def get_all(self, group_id): """Returns ALL members of the given group """ - LOG.debug(_('Memcached_Driver: get_all members of the %s group') % + LOG.debug('Memcached_Driver: get_all members of the %s group', group_id) rs = [] ctxt = context.get_admin_context() diff --git a/nova/servicegroup/drivers/zk.py b/nova/servicegroup/drivers/zk.py index e50b5aced4..a7a8b7b465 100644 --- a/nova/servicegroup/drivers/zk.py +++ b/nova/servicegroup/drivers/zk.py @@ -77,9 +77,9 @@ class ZooKeeperDriver(api.ServiceGroupDriver): def join(self, member_id, group, service=None): """Join the given service with its group.""" - LOG.debug(_('ZooKeeperDriver: join new member %(id)s to the ' - '%(gr)s group, service=%(sr)s'), - {'id': member_id, 'gr': group, 'sr': service}) + LOG.debug('ZooKeeperDriver: join new member %(id)s to the ' + '%(gr)s group, service=%(sr)s', + {'id': member_id, 'gr': group, 'sr': service}) member = self._memberships.get((group, member_id), None) if member is None: # the first time to join. Generate a new object @@ -98,7 +98,7 @@ class ZooKeeperDriver(api.ServiceGroupDriver): def leave(self, member_id, group): """Remove the given member from the service group.""" - LOG.debug(_('ZooKeeperDriver.leave: %(member)s from group %(group)s'), + LOG.debug('ZooKeeperDriver.leave: %(member)s from group %(group)s', {'member': member_id, 'group': group}) try: key = (group, member_id)