Graceful shutdown fixes (#218)

Author: droserasprout

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Please use [this](https://docs.gitlab.com/ee/development/changelog.html) document as guidelines to keep a changelog.
 
+## [unreleased]
+
+### Fixed
+
+* cli: Ignore `SIGINT` signal when shutdown is in progress.
+* sentry: Ignore exceptions when shutdown is in progress.
+
 ## 4.1.1 - 2022-01-25
 
 ### Fixed

src/dipdup/cli.py

@@ -57,6 +57,7 @@
 from dipdup.utils.database import wipe_schema
 
 _logger = logging.getLogger('dipdup.cli')
+_is_shutting_down = False
 
 
 def echo(message: str) -> None:
@@ -72,6 +73,11 @@ class CLIContext:
 
 
 async def shutdown() -> None:
+    global _is_shutting_down
+    if _is_shutting_down:
+        return
+    _is_shutting_down = True
+
     _logger.info('Shutting down')
     tasks = filter(lambda t: t != asyncio.current_task(), asyncio.all_tasks())
     list(map(asyncio.Task.cancel, tasks))
@@ -95,6 +101,12 @@ async def wrapper(*args, **kwargs) -> None:
     return wrapper
 
 
+def _sentry_before_send(event, _):
+    if _is_shutting_down:
+        return None
+    return event
+
+
 def init_sentry(config: DipDupConfig) -> None:
     if not config.sentry:
         return
@@ -116,6 +128,7 @@ def init_sentry(config: DipDupConfig) -> None:
         integrations=integrations,
         release=__version__,
         attach_stacktrace=attach_stacktrace,
+        before_send=_sentry_before_send,
     )
 
 

src/dipdup/http.py

@@ -80,7 +80,7 @@ async def __aenter__(self) -> None:
 
     async def __aexit__(self, exc_type, exc, tb):
         """Close underlying aiohttp session"""
-        self._logger.info('Closing gateway session (%s)', self._url)
+        self._logger.debug('Closing gateway session (%s)', self._url)
         await self.__session.close()
 
     @property