Merge "replace string format arguments with function parameters"
This commit is contained in:
commit
a053593c13
@ -141,7 +141,7 @@ class Server(object):
|
|||||||
self.log_queue,
|
self.log_queue,
|
||||||
self.ready))
|
self.ready))
|
||||||
self.process.start()
|
self.process.start()
|
||||||
LOG.debug("Server process started: pid: %d" % self.process.pid)
|
LOG.debug("Server process started: pid: %d", self.process.pid)
|
||||||
|
|
||||||
def _run_server(self, conf, url, log_queue, ready):
|
def _run_server(self, conf, url, log_queue, ready):
|
||||||
server_configurer(log_queue)
|
server_configurer(log_queue)
|
||||||
@ -161,8 +161,8 @@ class Server(object):
|
|||||||
LOG.debug("Waiting for the stop signal ...")
|
LOG.debug("Waiting for the stop signal ...")
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
self.rpc_server.stop()
|
self.rpc_server.stop()
|
||||||
LOG.debug("Leaving process T:%s Pid:%d" % (str(target),
|
LOG.debug("Leaving process T:%s Pid:%d", (str(target),
|
||||||
os.getpid()))
|
os.getpid()))
|
||||||
|
|
||||||
def cleanup(self):
|
def cleanup(self):
|
||||||
LOG.debug("Stopping server")
|
LOG.debug("Stopping server")
|
||||||
@ -217,7 +217,7 @@ class MutliprocTestCase(utils.SkipIfNoTransportURL):
|
|||||||
|
|
||||||
def spawn_server(self, name, wait_for_server=False, topic=None):
|
def spawn_server(self, name, wait_for_server=False, topic=None):
|
||||||
srv = Server(self.conf, self.log_queue, self.url, name, topic)
|
srv = Server(self.conf, self.log_queue, self.url, name, topic)
|
||||||
LOG.debug("[SPAWN] %s (starting)..." % srv.name)
|
LOG.debug("[SPAWN] %s (starting)...", srv.name)
|
||||||
srv.start()
|
srv.start()
|
||||||
if wait_for_server:
|
if wait_for_server:
|
||||||
while not srv.ready.value:
|
while not srv.ready.value:
|
||||||
|
@ -446,7 +446,7 @@ def main():
|
|||||||
with open('./oslo_res_%s.txt' % args.server, 'a+') as f:
|
with open('./oslo_res_%s.txt' % args.server, 'a+') as f:
|
||||||
f.write(log_msg + '\n')
|
f.write(log_msg + '\n')
|
||||||
|
|
||||||
LOG.info("calls finished, wait %d seconds" % args.exit_wait)
|
LOG.info("calls finished, wait %d seconds", args.exit_wait)
|
||||||
time.sleep(args.exit_wait)
|
time.sleep(args.exit_wait)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user