Use BaseService.run_daemon() where apropriate

Author: gsalgado

p2p/DEVELOPMENT.md

@@ -20,14 +20,19 @@ library.
 - If your service needs to run coroutines in the background, you should use the `BaseService.run_task()` method and
   ensure they exit when `is_running` is False or when the cancel token is triggered.
 - If your service runs other services in the background, you should pass your CancelToken down to
-  those services and run those using `BaseService.run_child_service()`.
+  those services and run those using `BaseService.run_child_service()`, or
+  `BaseService.run_daemon()` if you want the parent to be terminated when the child dies
+  unexpectedly.
 
 ```Python
 class Node(BaseService):
     async def _run(self):
         self.discovery = DiscoveryService(token=self.cancel_token)
-        self.run_child_service(self.discovery)
+        self.run_daemon(self.discovery)
         self.run_task(self.discovery.bootstrap())
+        # UPNP service is still experimental and not essential, so we don't use run_daemon() for
+        # it as that means if it crashes we'd be terminated as well.
+        self.run_child_service(UPnPService(token=self.cancel_token))
         # Node's run logic goes here...
 
 ```

trinity/nodes/light.py

@@ -45,7 +45,7 @@ def __init__(self, plugin_manager: PluginManager, chain_config: ChainConfig) ->
         self.notify_resource_available()
 
     async def _run(self) -> None:
-        self.run_child_service(self._peer_chain)
+        self.run_daemon(self._peer_chain)
         await super()._run()
 
     def get_chain(self) -> LightDispatchChain:

trinity/protocol/common/handlers.py

@@ -34,7 +34,7 @@ def __init__(self, peer: BasePeer) -> None:
     async def _run(self) -> None:
         for attr in self._managers.keys():
             manager = getattr(self, attr)
-            self.run_child_service(manager)
+            self.run_daemon(manager)
 
         await self.cancel_token.wait()
 

trinity/protocol/eth/peer.py

@@ -37,7 +37,7 @@ def get_extra_stats(self) -> List[str]:
     def requests(self) -> ETHRequestResponseHandler:
         if self._requests is None:
             self._requests = ETHRequestResponseHandler(self)
-            self.run_child_service(self._requests)
+            self.run_daemon(self._requests)
         return self._requests
 
     @property

trinity/protocol/les/peer.py

@@ -48,7 +48,7 @@ def get_extra_stats(self) -> List[str]:
     def requests(self) -> LESRequestResponseHandler:
         if self._requests is None:
             self._requests = LESRequestResponseHandler(self)
-            self.run_child_service(self._requests)
+            self.run_daemon(self._requests)
         return self._requests
 
     @property

trinity/server.py

@@ -151,8 +151,10 @@ async def _run(self) -> None:
             self.privkey, addr, self.bootstrap_nodes, self.preferred_nodes)
         self.discovery = DiscoveryService(
             discovery_proto, self.peer_pool, self.port, self.cancel_token)
-        self.run_child_service(self.peer_pool)
-        self.run_child_service(self.discovery)
+        self.run_daemon(self.peer_pool)
+        self.run_daemon(self.discovery)
+        # UPNP service is still experimental and not essential, so we don't use run_daemon() for
+        # it as that means if it crashes we'd be terminated as well.
         self.run_child_service(self.upnp_service)
         self.syncer = self._make_syncer(self.peer_pool)
         await self.syncer.run()