New method: BaseService.cancel_nowait()

Author: carver

p2p/service.py

@@ -187,8 +187,7 @@ async def cleanup(self) -> None:
 
         self.events.cleaned_up.set()
 
-    async def cancel(self) -> None:
-        """Trigger the CancelToken and wait for the cleaned_up event to be set."""
+    def cancel_nowait(self) -> None:
         if self.is_cancelled:
             self.logger.warning("Tried to cancel %s, but it was already cancelled", self)
             return
@@ -198,6 +197,11 @@ async def cancel(self) -> None:
         self.logger.debug("Cancelling %s", self)
         self.events.cancelled.set()
         self.cancel_token.trigger()
+
+    async def cancel(self) -> None:
+        """Trigger the CancelToken and wait for the cleaned_up event to be set."""
+        self.cancel_nowait()
+
         try:
             await asyncio.wait_for(
                 self.events.cleaned_up.wait(), timeout=self._wait_until_finished_timeout)