Merge "Use %()d for integer substitution"

This commit is contained in:
Jenkins 2016-08-16 04:27:55 +00:00 committed by Gerrit Code Review
commit 4037d97e35

View File

@ -97,12 +97,12 @@ class Server(service.ServiceBase):
try: try:
self._socket = eventlet.listen(bind_addr, family, backlog=backlog) self._socket = eventlet.listen(bind_addr, family, backlog=backlog)
except EnvironmentError: except EnvironmentError:
LOG.error(_LE("Could not bind to %(host)s:%(port)s"), LOG.error(_LE("Could not bind to %(host)s:%(port)d"),
{'host': host, 'port': port}) {'host': host, 'port': port})
raise raise
(self.host, self.port) = self._socket.getsockname()[0:2] (self.host, self.port) = self._socket.getsockname()[0:2]
LOG.info(_LI("%(name)s listening on %(host)s:%(port)s"), LOG.info(_LI("%(name)s listening on %(host)s:%(port)d"),
{'name': self.name, 'host': self.host, 'port': self.port}) {'name': self.name, 'host': self.host, 'port': self.port})
def start(self): def start(self):
@ -167,7 +167,7 @@ class Server(service.ServiceBase):
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_LE("Failed to start %(name)s on %(host)s" LOG.error(_LE("Failed to start %(name)s on %(host)s"
":%(port)s with SSL support"), ":%(port)d with SSL support"),
{'name': self.name, 'host': self.host, {'name': self.name, 'host': self.host,
'port': self.port}) 'port': self.port})