From b760a2c4e1c22973baee8daf44a332b123ad1fdb Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Wed, 1 Oct 2014 21:00:39 +0000 Subject: Allow ephemeral ports for distbuild services --- distbuild/sockserv.py | 2 +- morphlib/plugins/distbuild_plugin.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distbuild/sockserv.py b/distbuild/sockserv.py index 68991a93..156394e2 100644 --- a/distbuild/sockserv.py +++ b/distbuild/sockserv.py @@ -39,7 +39,7 @@ class ListenServer(StateMachine): if self._port_file: host, port = src.sock.getsockname() with open(self._port_file, 'w') as f: - f.write(port) + f.write('%s\n' % port) self.mainloop.add_event_source(src) spec = [ diff --git a/morphlib/plugins/distbuild_plugin.py b/morphlib/plugins/distbuild_plugin.py index 7e8188dd..26c26498 100644 --- a/morphlib/plugins/distbuild_plugin.py +++ b/morphlib/plugins/distbuild_plugin.py @@ -253,7 +253,7 @@ class ControllerDaemon(cliapp.Plugin): port = self.app.settings[port] port_file = self.app.settings[port_file] listener = distbuild.ListenServer( - addr, port, sm, extra_args=extra_args) + addr, port, sm, extra_args=extra_args, port_file=port_file) loop.add_state_machine(listener) for worker in self.app.settings['worker']: -- cgit v1.2.1