commit 18af751e0b86c00368230905208f6b4b6646e4a7 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 13 10:24:15 2019 -0400 wait_for_bootstrap: log node names with bootstrap statuses --- lib/chutney/TorNet.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 7269a00..3e8b94e 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -647,6 +647,10 @@ class LocalNodeController(NodeController): NodeController.__init__(self, env) self._env = env + def getNick(self): + """Return the nickname for this node.""" + return self._env['nick'] + def getPid(self): """Assuming that this node has its pidfile in ${dir}/pid, return the pid of the running process, or None if there is no pid in the @@ -1200,7 +1204,7 @@ class Network(object): print("Bootstrap failed. Node status:") for c in controllers: c.check(listRunning=False, listNonRunning=True) - print(c.getLastBootstrapStatus()) + print("{}: {}".format(c.getNick(), c.getLastBootstrapStatus())) return False