diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-03-03 19:05:54 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-03-03 19:05:54 +0000 |
| commit | a85179aff3bf2bc1b132e9918cd8222a61a8bcc2 (patch) | |
| tree | aac1ff9e5bdca7ddc0fdc9d2cae5a5dcf13e8733 /synapse/app | |
| parent | Empty commit (diff) | |
| parent | Merge pull request #621 from matrix-org/daniel/ratelimiting (diff) | |
| download | synapse-a85179aff3bf2bc1b132e9918cd8222a61a8bcc2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/SYN-642
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( |