Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Close the database connection we create during startup (#8131)

Browse Source 
... otherwise it gets leaked.
This commit is contained in:
Richard van der Hoff 2020-08-19 20:41:53 +01:00 committed by GitHub
parent c9c544cda5
commit 12aebdfa5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8131.bugfix Normal file
View File

@ -0,0 +1 @@
Fix a bug which could cause a leaked postgres connection if synapse was set to daemonize.

11
synapse/storage/databases/__init__.py
View File

@ -87,12 +87,21 @@ class Databases(object):
logger.info("Database %r prepared", db_name) logger.info("Database %r prepared", db_name)
# Closing the context manager doesn't close the connection.
# psycopg will close the connection when the object gets GCed, but *only*
# if the PID is the same as when the connection was opened [1], and
# it may not be if we fork in the meantime.
#
# [1]: https://github.com/psycopg/psycopg2/blob/2_8_5/psycopg/connection_type.c#L1378
db_conn.close()
# Sanity check that we have actually configured all the required stores. # Sanity check that we have actually configured all the required stores.
if not main: if not main:
raise Exception("No 'main' data store configured") raise Exception("No 'main' data store configured")
if not state: if not state:
raise Exception("No 'main' data store configured") raise Exception("No 'state' data store configured")
# We use local variables here to ensure that the databases do not have # We use local variables here to ensure that the databases do not have
# optional types. # optional types.