diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-03-03 13:56:28 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-03-03 13:56:28 +0000 |
| commit | 95481e7ba70fd5745c409ef285ed6bd0def81426 (patch) | |
| tree | e4d4b3c6215a228055ea3108fa3b0d3b87ecde0d /synapse/app | |
| parent | jenkins.sh: set -x (diff) | |
| parent | Mark AS users with their AS's ID (diff) | |
| download | synapse-95481e7ba70fd5745c409ef285ed6bd0def81426.tar.xz | |
Merge pull request #571 from matrix-org/daniel/asids
Mark AS users with their AS's ID
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index de5ee988f1..021dc1d610 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -386,7 +386,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( |