summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2016-02-11 14:10:00 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2016-02-11 17:26:42 +0000
commit763360594dfb90433f693056d3d64ac82409fc87 (patch)
tree1cfd7afde7a81909134349c09ba1cbc51c145990 /synapse/app
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-763360594dfb90433f693056d3d64ac82409fc87.tar.xz
Mark AS users with their AS's ID
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index 2b4be7bdd0..d2e758c401 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py
@@ -382,7 +382,7 @@ def setup(config_options): tls_server_context_factory = context_factory.ServerContextFactory(config) - database_engine = create_engine(config.database_config["name"]) + database_engine = create_engine(config) config.database_config["args"]["cp_openfun"] = database_engine.on_new_connection hs = SynapseHomeServer(