summary refs log tree commit diff
path: root/synapse/storage/database.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-12-31 13:40:57 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-12-31 13:40:57 +0000
commitb90b34744ab6292963f74509ecf4b4e553fc4085 (patch)
tree339e2c431c558f274ac25bcdd49c7009802259b9 /synapse/storage/database.py
parentMerge commit '88e1d0c52' into anoa/dinsic_release_1_23_1 (diff)
parentMerge pull request #8678 from matrix-org/rav/fix_frozen_events (diff)
downloadsynapse-b90b34744ab6292963f74509ecf4b4e553fc4085.tar.xz
Merge commit 'c97da1e45' into anoa/dinsic_release_1_23_1
Diffstat (limited to 'synapse/storage/database.py')
-rw-r--r--synapse/storage/database.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/database.py b/synapse/storage/database.py

index 0217e63108..a0572b2952 100644 --- a/synapse/storage/database.py +++ b/synapse/storage/database.py
@@ -94,7 +94,7 @@ def make_pool( cp_openfun=lambda conn: engine.on_new_connection( LoggingDatabaseConnection(conn, engine, "on_new_connection") ), - **db_config.config.get("args", {}) + **db_config.config.get("args", {}), ) @@ -632,7 +632,7 @@ class DatabasePool: func, *args, db_autocommit=db_autocommit, - **kwargs + **kwargs, ) for after_callback, after_args, after_kwargs in after_callbacks: