From 3e4db868e641992198d3d7404fd0104ba9169f23 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Sat, 22 Oct 2016 11:06:44 +0900
Subject: [PATCH] Don't start servers for now.

---
 server/controller.py | 48 ++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/server/controller.py b/server/controller.py
index 7343ab5..5812f04 100644
--- a/server/controller.py
+++ b/server/controller.py
@@ -37,30 +37,12 @@ class Controller(LoggedClass):
         env = self.env
         loop = self.loop
 
-        if False:
-            protocol = partial(LocalRPC, self)
-            if env.rpc_port is not None:
-                host = 'localhost'
-                rpc_server = loop.create_server(protocol, host, env.rpc_port)
-                self.servers.append(loop.run_until_complete(rpc_server))
-                self.logger.info('RPC server listening on {}:{:d}'
-                                 .format(host, env.rpc_port))
-
-            protocol = partial(ElectrumX, self, self.daemon, env)
-            if env.tcp_port is not None:
-                tcp_server = loop.create_server(protocol, env.host, env.tcp_port)
-                self.servers.append(loop.run_until_complete(tcp_server))
-                self.logger.info('TCP server listening on {}:{:d}'
-                                 .format(env.host, env.tcp_port))
-
-            if env.ssl_port is not None:
-                ssl_server = loop.create_server(protocol, env.host, env.ssl_port)
-                self.servers.append(loop.run_until_complete(ssl_server))
-                self.logger.info('SSL server listening on {}:{:d}'
-                                 .format(env.host, env.ssl_port))
-
         coros = self.block_processor.coros()
 
+        if False:
+            self.start_servers()
+            coros.append(self.reap_jobs())
+
         for coro in coros:
             asyncio.ensure_future(coro)
 
@@ -69,6 +51,28 @@ class Controller(LoggedClass):
             loop.add_signal_handler(getattr(signal, signame),
                                     partial(self.on_signal, signame))
 
+    def start_servers(self):
+        protocol = partial(LocalRPC, self)
+        if env.rpc_port is not None:
+            host = 'localhost'
+            rpc_server = loop.create_server(protocol, host, env.rpc_port)
+            self.servers.append(loop.run_until_complete(rpc_server))
+            self.logger.info('RPC server listening on {}:{:d}'
+                             .format(host, env.rpc_port))
+
+        protocol = partial(ElectrumX, self, self.daemon, env)
+        if env.tcp_port is not None:
+            tcp_server = loop.create_server(protocol, env.host, env.tcp_port)
+            self.servers.append(loop.run_until_complete(tcp_server))
+            self.logger.info('TCP server listening on {}:{:d}'
+                             .format(env.host, env.tcp_port))
+
+        if env.ssl_port is not None:
+            ssl_server = loop.create_server(protocol, env.host, env.ssl_port)
+            self.servers.append(loop.run_until_complete(ssl_server))
+            self.logger.info('SSL server listening on {}:{:d}'
+                             .format(env.host, env.ssl_port))
+
     def stop(self):
         '''Close the listening servers.'''
         for server in self.servers: