[incubator-ponymail-foal] 01/02: Tidy up ES connnections

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit d0ea7f7a88467ed3ed346090e65a7eebd1235bc0
Author: Sebb <se...@apache.org>
AuthorDate: Wed Feb 2 00:24:06 2022 +0000

    Tidy up ES connnections
---
 server/main.py               | 2 ++
 server/plugins/background.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/server/main.py b/server/main.py
index 325b76a..39b7b72 100644
--- a/server/main.py
+++ b/server/main.py
@@ -235,6 +235,8 @@ class Server(plugins.server.BaseServer):
             % (self.config.server.ip, self.config.server.port)
         )
         await plugins.background.run_tasks(self)
+        while not self.dbpool.empty():
+            await self.dbpool.get_nowait().client.close()
         await site.stop() # try to clean up
 
     def run(self):
diff --git a/server/plugins/background.py b/server/plugins/background.py
index f7d52ba..40ebbd7 100644
--- a/server/plugins/background.py
+++ b/server/plugins/background.py
@@ -240,6 +240,7 @@ async def run_tasks(server: plugins.server.BaseServer) -> None:
     server.library_version = ".".join([str(v) for v in ES_VERSION])
     db = plugins.database.Database(server.config.database)
     server.engine_version = (await db.info())['version']['number']
+    await db.client.close()
 
     while True:
         await get_data(server)