diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-04-09 18:44:49 +0300 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-04-10 15:13:29 +0300 |
commit | 3efa5ad43c988421c1402e9fa986b6ea25f38e1a (patch) | |
tree | fc8ec864c3284b3a12dfde6587d6065d727fd51e /distbuild/worker_build_scheduler.py | |
parent | b772a26680895ecf102b524444623fc10c4d183d (diff) | |
download | morph-3efa5ad43c988421c1402e9fa986b6ea25f38e1a.tar.gz |
distbuild: Log IPs of initiators and workers in more places
This makes tracking multiple builds through one log file a bit easier.
Diffstat (limited to 'distbuild/worker_build_scheduler.py')
-rw-r--r-- | distbuild/worker_build_scheduler.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/distbuild/worker_build_scheduler.py b/distbuild/worker_build_scheduler.py index 315d3094..5ec7c9aa 100644 --- a/distbuild/worker_build_scheduler.py +++ b/distbuild/worker_build_scheduler.py @@ -193,11 +193,13 @@ class WorkerConnection(distbuild.StateMachine): self._worker_cache_server_port = worker_cache_server_port self._morph_instance = morph_instance self._helper_id = None - - def name(self): + addr, port = self._conn.getpeername() name = socket.getfqdn(addr) - return '%s:%s' % (name, port) + self._worker_name = '%s:%s' % (name, port) + + def name(self): + return self._worker_name def setup(self): distbuild.crash_point() @@ -231,7 +233,7 @@ class WorkerConnection(distbuild.StateMachine): self._request_job(None, None) def _maybe_cancel(self, event_source, build_cancel): - logging.debug('WC: BuildController requested a cancel') + logging.debug('WC: BuildController %r requested a cancel' % event_source) if build_cancel.id == self._initiator_id: distbuild.crash_point() @@ -265,7 +267,7 @@ class WorkerConnection(distbuild.StateMachine): stdin_contents=distbuild.serialise_artifact(self._artifact), ) self._jm.send(msg) - logging.debug('WC: sent to worker: %s' % repr(msg)) + logging.debug('WC: sent to worker %s: %r' % (self._worker_name, msg)) self._route_map.add(self._initiator_id, msg['id']) self._initiator_request_map[self._initiator_id].add(msg['id']) logging.debug( @@ -281,7 +283,7 @@ class WorkerConnection(distbuild.StateMachine): distbuild.crash_point() - logging.debug('WC: from worker: %s' % repr(event.msg)) + logging.debug('WC: from worker %s: %r' % (self._worker_name, event.msg)) handlers = { 'exec-output': self._handle_exec_output, |