summary refs log tree commit diff
path: root/synapse/config/database.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-17 10:56:55 +0100
committerErik Johnston <erik@matrix.org>2019-07-17 10:56:55 +0100
commit5299707329e1c5d6228605ca660800f6dc4cf20d (patch)
tree5277555c65670460cbd761698b1c920473d2835f /synapse/config/database.py
parentMerge remote-tracking branch 'origin/release-v1.1.0' into matrix-org-hotfixes (diff)
parentMerge pull request #5597 from matrix-org/erikj/admin_api_cmd (diff)
downloadsynapse-5299707329e1c5d6228605ca660800f6dc4cf20d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/database.py')
-rw-r--r--synapse/config/database.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/database.py b/synapse/config/database.py

index bcb2089dd7..746a6cd1f4 100644 --- a/synapse/config/database.py +++ b/synapse/config/database.py
@@ -69,7 +69,8 @@ class DatabaseConfig(Config): if database_path is not None: self.database_config["args"]["database"] = database_path - def add_arguments(self, parser): + @staticmethod + def add_arguments(parser): db_group = parser.add_argument_group("database") db_group.add_argument( "-d",