Commit e03cb3e3 authored by Kean Johnston's avatar Kean Johnston
Browse files

[530] Merge branch 'trac530'

parents e144ab7b 495195f6
...@@ -490,7 +490,7 @@ class Init: ...@@ -490,7 +490,7 @@ class Init:
self.log_starting("b10-msgq") self.log_starting("b10-msgq")
msgq_proc = self._make_process_info("b10-msgq", ["b10-msgq"], msgq_proc = self._make_process_info("b10-msgq", ["b10-msgq"],
self.c_channel_env, self.c_channel_env,
True, not self.verbose) not self.verbose, not self.verbose)
msgq_proc.spawn() msgq_proc.spawn()
self.log_started(msgq_proc.pid) self.log_started(msgq_proc.pid)
...@@ -741,8 +741,12 @@ class Init: ...@@ -741,8 +741,12 @@ class Init:
try: try:
self.cc_session = isc.cc.Session(self.msgq_socket_file) self.cc_session = isc.cc.Session(self.msgq_socket_file)
logger.fatal(BIND10_MSGQ_ALREADY_RUNNING) logger.fatal(BIND10_MSGQ_ALREADY_RUNNING)
return "b10-msgq already running, or socket file not cleaned , " +\ if self.msgq_socket_file is not None:
"cannot start" socket_name = "socket file '" + self.msg_socket_file + "'"
else:
socket_name = "default socket file"
return "b10-msgq already running, or " + socket_name +\
" not cleaned - cannot start"
except isc.cc.session.SessionError: except isc.cc.session.SessionError:
# this is the case we want, where the msgq is not running # this is the case we want, where the msgq is not running
pass pass
......
...@@ -1651,7 +1651,7 @@ class TestInitComponents(unittest.TestCase): ...@@ -1651,7 +1651,7 @@ class TestInitComponents(unittest.TestCase):
pi = init.start_msgq() pi = init.start_msgq()
self.assertEqual('b10-msgq', pi.name) self.assertEqual('b10-msgq', pi.name)
self.assertEqual(['b10-msgq'], pi.args) self.assertEqual(['b10-msgq'], pi.args)
self.assertTrue(pi.dev_null_stdout) self.assertEqual(pi.dev_null_stdout, not verbose)
self.assertEqual(pi.dev_null_stderr, not verbose) self.assertEqual(pi.dev_null_stderr, not verbose)
self.assertEqual({'FOO': 'an env string'}, pi.env) self.assertEqual({'FOO': 'an env string'}, pi.env)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment