diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-05-01 13:54:38 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-05-01 13:54:38 +0100 |
commit | 46a65c282fc92d2c783af84423ef4a0690a2cf48 (patch) | |
tree | ae09151860643c597375a918efb081736ae90372 /synapse/config/database.py | |
parent | Allow "manhole" to be ommited from the config (diff) | |
download | synapse-46a65c282fc92d2c783af84423ef4a0690a2cf48.tar.xz |
Allow generate-config to run against an existing config file to generate default keys
Diffstat (limited to 'synapse/config/database.py')
-rw-r--r-- | synapse/config/database.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/database.py b/synapse/config/database.py index ccd96c4f0f..f0611e8884 100644 --- a/synapse/config/database.py +++ b/synapse/config/database.py @@ -56,6 +56,7 @@ class DatabaseConfig(Config): args: # Path to the database database: "%(database_path)s" + # Number of events to cache in memory. event_cache_size: "10K" """ % locals() @@ -68,7 +69,7 @@ class DatabaseConfig(Config): database_path = self.abspath(database_path) if self.database_config.get("name", None) == "sqlite3": if database_path is not None: - self.database_config["database"] = database_path + self.database_config["args"]["database"] = database_path def add_arguments(self, parser): db_group = parser.add_argument_group("database") |