Ensure plugins don't hang the process on exit

Author: cburgdorf

fixtures

@@ -42,7 +42,7 @@
         "ipython>=6.2.1,<7.0.0",
         "plyvel==1.0.5",
         "web3==4.4.1",
-        "lahja==0.6.1",
+        "lahja==0.8.0",
         "uvloop==0.11.2;platform_system=='Linux' or platform_system=='Darwin'",
     ],
     'test': [

setup.py

@@ -76,6 +76,9 @@
 from trinity.utils.profiling import (
     setup_cprofiler,
 )
+from trinity.utils.shutdown import (
+    exit_on_signal
+)
 from trinity.utils.version import (
     construct_trinity_client_identifier,
 )
@@ -260,6 +263,7 @@ def trinity_boot(args: Namespace,
             database_server_process,
             networking_process,
             plugin_manager,
+            main_endpoint,
             event_bus
         )
     )
@@ -279,6 +283,7 @@ def trinity_boot(args: Namespace,
             database_server_process,
             networking_process,
             plugin_manager,
+            main_endpoint,
             event_bus
         )
 
@@ -287,6 +292,7 @@ def kill_trinity_gracefully(logger: logging.Logger,
                             database_server_process: Any,
                             networking_process: Any,
                             plugin_manager: PluginManager,
+                            main_endpoint: Endpoint,
                             event_bus: EventBus,
                             message: str="Trinity shudown complete\n") -> None:
     # When a user hits Ctrl+C in the terminal, the SIGINT is sent to all processes in the
@@ -301,7 +307,8 @@ def kill_trinity_gracefully(logger: logging.Logger,
     # perform a non-gracefull shutdown if the process takes too long to terminate.
     logger.info('Keyboard Interrupt: Stopping')
     plugin_manager.shutdown()
-    event_bus.shutdown()
+    main_endpoint.stop()
+    event_bus.stop()
     kill_process_gracefully(database_server_process, logger)
     logger.info('DB server process (pid=%d) terminated', database_server_process.pid)
     # XXX: This short sleep here seems to avoid us hitting a deadlock when attempting to
@@ -336,21 +343,6 @@ def _sigint_handler(*args: Any) -> None:
             raise
 
 
-async def exit_on_signal(service_to_exit: BaseService) -> None:
-    loop = service_to_exit.get_event_loop()
-    sigint_received = asyncio.Event()
-    for sig in [signal.SIGINT, signal.SIGTERM]:
-        # TODO also support Windows
-        loop.add_signal_handler(sig, sigint_received.set)
-
-    await sigint_received.wait()
-    try:
-        await service_to_exit.cancel()
-        service_to_exit._executor.shutdown(wait=True)
-    finally:
-        loop.stop()
-
-
 @setup_cprofiler('launch_node')
 @with_queued_logging
 def launch_node(args: Namespace, chain_config: ChainConfig, endpoint: Endpoint) -> None:

trinity/main.py

@@ -0,0 +1,27 @@
+import asyncio
+import signal
+
+from lahja import (
+    Endpoint,
+)
+
+from p2p.service import (
+    BaseService,
+)
+
+
+async def exit_on_signal(service_to_exit: BaseService, endpoint: Endpoint = None) -> None:
+    loop = service_to_exit.get_event_loop()
+    sigint_received = asyncio.Event()
+    for sig in [signal.SIGINT, signal.SIGTERM]:
+        # TODO also support Windows
+        loop.add_signal_handler(sig, sigint_received.set)
+
+    await sigint_received.wait()
+    try:
+        await service_to_exit.cancel()
+        if endpoint is not None:
+            endpoint.stop()
+        service_to_exit._executor.shutdown(wait=True)
+    finally:
+        loop.stop()