summary refs log tree commit diff
path: root/synapse/config/database.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-01 15:51:15 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-01 15:51:15 +0100
commit9ea1de432dedf2130a036fc9eb9d0b8515a24fe8 (patch)
tree88753b866924c2d247ae9277d801fbcef1a0d513 /synapse/config/database.py
parentMerge branch 'develop' into server2server_tls (diff)
downloadsynapse-9ea1de432dedf2130a036fc9eb9d0b8515a24fe8.tar.xz
Fix homeserver config parsing
Diffstat (limited to 'synapse/config/database.py')
-rw-r--r--synapse/config/database.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/config/database.py b/synapse/config/database.py

index 43f54be437..edf2361914 100644 --- a/synapse/config/database.py +++ b/synapse/config/database.py
@@ -18,14 +18,15 @@ import os class DatabaseConfig(Config): def __init__(self, args): - self.db_path = os.path.abspath(args.database_path) + super(DatabaseConfig, self).__init__(args) + self.database_path = self.abspath(args.database_path) @classmethod def add_arguments(cls, parser): super(DatabaseConfig, cls).add_arguments(parser) db_group = parser.add_argument_group("database") db_group.add_argument( - "-d", "--database", dest="database_path", default="homeserver.db", + "-d", "--database-path", default="homeserver.db", help="The database name." )