Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
e03cb3e3
Commit
e03cb3e3
authored
Nov 14, 2013
by
Kean Johnston
Browse files
[530] Merge branch 'trac530'
parents
e144ab7b
495195f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/bind10/init.py.in
View file @
e03cb3e3
...
...
@@ -490,7 +490,7 @@ class Init:
self.log_starting("b10-msgq")
msgq_proc = self._make_process_info("b10-msgq", ["b10-msgq"],
self.c_channel_env,
Tru
e, not self.verbose)
not self.verbos
e, not self.verbose)
msgq_proc.spawn()
self.log_started(msgq_proc.pid)
...
...
@@ -741,8 +741,12 @@ class Init:
try:
self.cc_session = isc.cc.Session(self.msgq_socket_file)
logger.fatal(BIND10_MSGQ_ALREADY_RUNNING)
return "b10-msgq already running, or socket file not cleaned , " +\
"cannot start"
if self.msgq_socket_file is not None:
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:
# this is the case we want, where the msgq is not running
pass
...
...
src/bin/bind10/tests/init_test.py.in
View file @
e03cb3e3
...
...
@@ -1651,7 +1651,7 @@ class TestInitComponents(unittest.TestCase):
pi = init.start_msgq()
self.assertEqual('b10-msgq', pi.name)
self.assertEqual(['b10-msgq'], pi.args)
self.assert
True
(pi.dev_null_stdout)
self.assert
Equal
(pi.dev_null_stdout
, not verbose
)
self.assertEqual(pi.dev_null_stderr, not verbose)
self.assertEqual({'FOO': 'an env string'}, pi.env)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment