add graceful shutdown

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- add graceful shutdown
 - add timeout monitoring for received packets
 - parse Modbus values and store them in the database
 - add cron task to request the output power every minute

app/src/async_stream.py

@@ -90,11 +90,15 @@ class AsyncStream():
                     f"{traceback.format_exc()}")
 
     async def disc(self) -> None:
+        if self.writer.is_closing():
+            return
         logger.debug(f'AsyncStream.disc() l{self.l_addr} | r{self.r_addr}')
         self.writer.close()
         await self.writer.wait_closed()
 
     def close(self):
+        if self.writer.is_closing():
+            return
         logger.debug(f'AsyncStream.close() l{self.l_addr} | r{self.r_addr}')
         self.writer.close()
 

app/src/server.py

@@ -1,7 +1,6 @@
 import logging
 import asyncio
 import signal
-import functools
 import os
 from logging import config  # noqa F401
 from messages import Message
@@ -26,13 +25,23 @@ async def handle_client_v2(reader, writer):
     await InverterG3P(reader, writer, addr).server_loop(addr)
 
 
-def handle_SIGTERM(loop):
+async def handle_shutdown(loop):
     '''Close all TCP connections and stop the event loop'''
 
     logging.info('Shutdown due to SIGTERM')
 
     #
-    # first, close all open TCP connections
+    # first, disc all open TCP connections gracefully
+    #
+    for stream in Message:
+        try:
+            await asyncio.wait_for(stream.disc(), 2)
+        except Exception:
+            pass
+    logging.info('Disconnecting done')
+
+    #
+    # second, close all open TCP connections
     #
     for stream in Message:
         stream.close()
@@ -91,7 +100,8 @@ if __name__ == "__main__":
     #
     for signame in ('SIGINT', 'SIGTERM'):
         loop.add_signal_handler(getattr(signal, signame),
-                                functools.partial(handle_SIGTERM, loop))
+                                lambda loop=loop: asyncio.create_task(
+                                    handle_shutdown(loop)))
 
     #
     # Create taska for our listening servera. These must be tasks! If we call