diff --git a/contrib/ipaextractor.py b/contrib/ipaextractor.py index 5f1dcbef..5dbc666d 100644 --- a/contrib/ipaextractor.py +++ b/contrib/ipaextractor.py @@ -111,7 +111,7 @@ def rec2des(rec, zonename): rectypes.append(k) else: LOG.info(_LI("Skipping unknown record type " - "%(type)s in %(name)s") % + "%(type)s in %(name)s"), {'type': k, 'name': name}) desrecs = [] @@ -182,14 +182,14 @@ def syncipaservers2des(servers, designatereq, designateurl): # first - add servers from ipa not already in designate for server in servers: if server in dservers: - LOG.info(_LI("Skipping ipa server %s already in designate") - % server) + LOG.info(_LI("Skipping ipa server %s already in designate"), + server) else: desreq = {"name": server} resp = designatereq.post(srvurl, data=json.dumps(desreq)) LOG.debug("Response: %s" % pprint.pformat(resp.json())) if resp.status_code == 200: - LOG.info(_LI("Added server %s to designate") % server) + LOG.info(_LI("Added server %s to designate"), server) else: raise AddServerError("Unable to add %s: %s" % (server, pprint.pformat(resp.json()))) @@ -199,7 +199,7 @@ def syncipaservers2des(servers, designatereq, designateurl): if server not in servers: delresp = designatereq.delete(srvurl + "/" + sid) if delresp.status_code == 200: - LOG.info(_LI("Deleted server %s") % server) + LOG.info(_LI("Deleted server %s"), server) else: raise DeleteServerError("Unable to delete %s: %s" % (server, @@ -293,7 +293,7 @@ def main(): exc = None fakezoneid = None if resp.status_code == 200: - LOG.info(_LI("Added domain %s") % domname) + LOG.info(_LI("Added domain %s"), domname) fakezoneid = resp.json()['id'] delresp = designatereq.delete(domainurl + "/" + fakezoneid) if delresp.status_code != 200: @@ -338,7 +338,7 @@ def main(): desreq = zone2des(zonerec) resp = designatereq.post(domainurl, data=json.dumps(desreq)) if resp.status_code == 200: - LOG.info(_LI("Added domain %s") % desreq['name']) + LOG.info(_LI("Added domain %s"), desreq['name']) else: raise AddDomainError("Unable to add domain %s: %s" % (desreq['name'], pprint.pformat(resp.json()))) @@ -354,7 +354,7 @@ def main(): resp = designatereq.post(recurl, data=json.dumps(desreq)) if resp.status_code == 200: LOG.info(_LI("Added record %(record)s " - "for domain %(domain)s") % + "for domain %(domain)s"), {'record': desreq['name'], 'domain': zonename}) else: raise AddRecordError("Could not add record %s: %s" % diff --git a/contrib/records_mass_create.py b/contrib/records_mass_create.py index 3d2dc0b4..7cdf1ca9 100644 --- a/contrib/records_mass_create.py +++ b/contrib/records_mass_create.py @@ -48,7 +48,7 @@ if __name__ == '__main__': domain = client.domains.get(cfg.CONF.domain_id) - msg = "Creating %s records" % cfg.CONF.records + msg = "Creating %s records", cfg.CONF.records LOG.info(msg) for i in range(0, cfg.CONF.records): name = '%s.%s' % (str(uuid.uuid4()), domain.name) diff --git a/contrib/tempest/config.py b/contrib/tempest/config.py index 3ebd3cdb..d4df0d7e 100644 --- a/contrib/tempest/config.py +++ b/contrib/tempest/config.py @@ -1056,7 +1056,7 @@ class TempestConfigPrivate(object): cfg.CONF([], project='tempest', default_config_files=config_files) logging.setup('tempest') LOG = logging.getLogger('tempest') - # LOG.info("Using tempest config file %s" % path) + # LOG.info("Using tempest config file %s", path) register_opts() self._set_attrs() if parse_conf: diff --git a/contrib/zoneextractor.py b/contrib/zoneextractor.py index f9e03215..d30f5fd7 100644 --- a/contrib/zoneextractor.py +++ b/contrib/zoneextractor.py @@ -171,7 +171,7 @@ class Extractor: allow_include=True) except dns.zone.UnknownOrigin: LOG.info(_LI('%(zonefile)s is missing $ORIGIN, ' - 'inserting %(name)s') % + 'inserting %(name)s'), {'zonefile': zonefile, 'name': name}) zone_object = dns.zone.from_file(zonefile, allow_include=True, diff --git a/designate/agent/handler.py b/designate/agent/handler.py index afe7ebba..d3510c56 100644 --- a/designate/agent/handler.py +++ b/designate/agent/handler.py @@ -53,7 +53,7 @@ class RequestHandler(object): master = {'host': raw_server[0], 'port': int(raw_server[1])} self.masters.append(master) - LOG.info(_LI("Agent masters: %(masters)s") % + LOG.info(_LI("Agent masters: %(masters)s"), {'masters': self.masters}) self.allow_notify = CONF['service:agent'].allow_notify diff --git a/designate/api/middleware.py b/designate/api/middleware.py index d7a73296..0509ada4 100644 --- a/designate/api/middleware.py +++ b/designate/api/middleware.py @@ -62,7 +62,7 @@ def auth_pipeline_factory(loader, global_conf, **local_conf): """ pipeline = local_conf[cfg.CONF['service:api'].auth_strategy] pipeline = pipeline.split() - LOG.info(_LI('Getting auth pipeline: %s') % pipeline[:-1]) + LOG.info(_LI('Getting auth pipeline: %s'), pipeline[:-1]) filters = [loader.get_filter(n) for n in pipeline[:-1]] app = loader.get_app(pipeline[-1]) filters.reverse() diff --git a/designate/api/service.py b/designate/api/service.py index 2140fe1a..eca2ec4a 100644 --- a/designate/api/service.py +++ b/designate/api/service.py @@ -43,6 +43,6 @@ class Service(service.WSGIService, service.Service): msg = 'Unable to determine appropriate api-paste-config file' raise exceptions.ConfigurationError(msg) - LOG.info(_LI('Using api-paste-config found at: %s') % config_paths[0]) + LOG.info(_LI('Using api-paste-config found at: %s'), config_paths[0]) return deploy.loadapp("config:%s" % config_paths[0], name='osapi_dns') diff --git a/designate/dnsutils.py b/designate/dnsutils.py index 5c65165a..ad587197 100644 --- a/designate/dnsutils.py +++ b/designate/dnsutils.py @@ -336,7 +336,7 @@ def do_axfr(zone_name, servers, timeout=None, source=None): to = eventlet.Timeout(timeout) log_info = {'name': zone_name, 'host': srv} try: - LOG.info(_LI("Doing AXFR for %(name)s from %(host)s") % log_info) + LOG.info(_LI("Doing AXFR for %(name)s from %(host)s"), log_info) xfr = dns.query.xfr(srv['host'], zone_name, relativize=False, timeout=1, port=srv['port'], source=source) diff --git a/designate/objects/adapters/base.py b/designate/objects/adapters/base.py index 7935657c..ceb5bbce 100644 --- a/designate/objects/adapters/base.py +++ b/designate/objects/adapters/base.py @@ -178,7 +178,7 @@ class DesignateAdapter(object): except exceptions.InvalidObject: LOG.info(_LI("InvalidObject creating %(name)s with " - "values %(values)r") % + "values %(values)r"), {"name": output_object.obj_name(), "values": values}) raise diff --git a/designate/policy.py b/designate/policy.py index af992151..da9c6143 100644 --- a/designate/policy.py +++ b/designate/policy.py @@ -69,7 +69,7 @@ def init(default_rule=None): msg = 'Unable to determine appropriate policy json file' raise exceptions.ConfigurationError(msg) - LOG.info(_LI('Using policy_file found at: %s') % policy_files[0]) + LOG.info(_LI('Using policy_file found at: %s'), policy_files[0]) with open(policy_files[0]) as fh: policy_string = fh.read() @@ -98,9 +98,9 @@ def check(rule, ctxt, target=None, do_raise=True, exc=exceptions.Forbidden): if result: LOG.info(_("Policy check succeeded for rule '%(rule)s' " - "on target %(target)s") % + "on target %(target)s"), {'rule': rule, 'target': repr(target)}, extra=extra) else: LOG.info(_("Policy check failed for rule '%(rule)s' " - "on target %(target)s") % + "on target %(target)s"), {'rule': rule, 'target': repr(target)}, extra=extra) diff --git a/designate/pool_manager/rpcapi.py b/designate/pool_manager/rpcapi.py index 6982d041..3df17051 100644 --- a/designate/pool_manager/rpcapi.py +++ b/designate/pool_manager/rpcapi.py @@ -62,7 +62,7 @@ class PoolManagerAPI(object): def create_zone(self, context, zone): LOG.info(_LI("create_zone: Calling pool manager for %(zone)s, " - "serial:%(serial)s") % + "serial:%(serial)s"), {'zone': zone.name, 'serial': zone.serial}) # Modifying the topic so it is pool manager instance specific. @@ -73,7 +73,7 @@ class PoolManagerAPI(object): def delete_zone(self, context, zone): LOG.info(_LI("delete_zone: Calling pool manager for %(zone)s, " - "serial:%(serial)s") % + "serial:%(serial)s"), {'zone': zone.name, 'serial': zone.serial}) # Modifying the topic so it is pool manager instance specific. @@ -84,7 +84,7 @@ class PoolManagerAPI(object): def update_zone(self, context, zone): LOG.info(_LI("update_zone: Calling pool manager for %(zone)s, " - "serial:%(serial)s") % + "serial:%(serial)s"), {'zone': zone.name, 'serial': zone.serial}) # Modifying the topic so it is pool manager instance specific. @@ -97,7 +97,7 @@ class PoolManagerAPI(object): actual_serial): LOG.info(_LI("update_status: Calling pool manager for %(zone)s : " "%(action)s : %(status)s : %(serial)s on nameserver " - "'%(host)s:%(port)s'") % + "'%(host)s:%(port)s'"), {'zone': zone.name, 'action': zone.action, 'status': status, 'serial': actual_serial, 'host': nameserver.host, 'port': nameserver.port}) diff --git a/designate/pool_manager/service.py b/designate/pool_manager/service.py index 2086625d..14845745 100644 --- a/designate/pool_manager/service.py +++ b/designate/pool_manager/service.py @@ -120,8 +120,8 @@ class Service(service.RPCService, coordination.CoordinationMixin, topic = super(Service, self)._rpc_topic topic = '%s.%s' % (topic, CONF['service:pool_manager'].pool_id) - LOG.info(_LI('Using topic %(topic)s for this pool manager instance.') - % {'topic': topic}) + LOG.info(_LI('Using topic %(topic)s for this pool manager instance.'), + {'topic': topic}) return topic @@ -382,7 +382,7 @@ class Service(service.RPCService, coordination.CoordinationMixin, return False def _update_zone_on_also_notify(self, context, also_notify, zone): - LOG.info(_LI('Updating zone %(zone)s on also_notify %(server)s.') % + LOG.info(_LI('Updating zone %(zone)s on also_notify %(server)s.'), {'zone': zone.name, 'server': self._get_destination(also_notify)}) @@ -502,7 +502,7 @@ class Service(service.RPCService, coordination.CoordinationMixin, if consensus_serial != 0 and cache_serial <= consensus_serial \ and zone.status != 'ACTIVE': LOG.info(_LI('For zone %(zone)s ' - 'the consensus serial is %(consensus_serial)s.') % + 'the consensus serial is %(consensus_serial)s.'), {'zone': zone.name, 'consensus_serial': consensus_serial}) self.central_api.update_status( diff --git a/designate/service.py b/designate/service.py index eecb91c2..490cf66f 100644 --- a/designate/service.py +++ b/designate/service.py @@ -87,12 +87,12 @@ class Service(service.Service): def start(self): super(Service, self).start() - LOG.info(_('Starting %(name)s service (version: %(version)s)') % + LOG.info(_('Starting %(name)s service (version: %(version)s)'), {'name': self.service_name, 'version': version.version_info.version_string()}) def stop(self): - LOG.info(_('Stopping %(name)s service') % {'name': self.service_name}) + LOG.info(_('Stopping %(name)s service'), {'name': self.service_name}) super(Service, self).stop() diff --git a/designate/zone_manager/service.py b/designate/zone_manager/service.py index 9dffc19f..ba03bb5e 100644 --- a/designate/zone_manager/service.py +++ b/designate/zone_manager/service.py @@ -81,7 +81,7 @@ class Service(service.RPCService, coordination.CoordinationMixin, self.tg.add_timer(interval, task) def _rebalance(self, my_partitions, members, event): - LOG.info(_LI("Received rebalance event %s") % event) + LOG.info(_LI("Received rebalance event %s"), event) self.partition_range = my_partitions # Begin RPC Implementation diff --git a/designate/zone_manager/tasks.py b/designate/zone_manager/tasks.py index a4dc5fdf..18c2852f 100644 --- a/designate/zone_manager/tasks.py +++ b/designate/zone_manager/tasks.py @@ -126,7 +126,7 @@ class DeletedZonePurgeTask(PeriodicTask): """ pstart, pend = self._my_range() msg = _LI("Performing deleted zone purging for %(start)s to %(end)s") - LOG.info(msg % {"start": pstart, "end": pend}) + LOG.info(msg, {"start": pstart, "end": pend}) delta = datetime.timedelta(seconds=self.options.time_threshold) time_threshold = timeutils.utcnow() - delta @@ -169,7 +169,7 @@ class PeriodicExistsTask(PeriodicTask): def __call__(self): pstart, pend = self._my_range() msg = _LI("Emitting zone exist events for %(start)s to %(end)s") - LOG.info(msg % {"start": pstart, "end": pend}) + LOG.info(msg, {"start": pstart, "end": pend}) ctxt = context.DesignateContext.get_admin_context() ctxt.all_tenants = True @@ -202,7 +202,7 @@ class PeriodicSecondaryRefreshTask(PeriodicTask): def __call__(self): pstart, pend = self._my_range() msg = _LI("Refreshing zones between for %(start)s to %(end)s") - LOG.info(msg % {"start": pstart, "end": pend}) + LOG.info(msg, {"start": pstart, "end": pend}) ctxt = context.DesignateContext.get_admin_context() ctxt.all_tenants = True