diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-11 10:33:19 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-11 10:33:19 +0000 |
| commit | fb233dc40b3111e905e394e627b8ecc3b2a91e80 (patch) | |
| tree | 931ab474f042b5eb5df9663306a4936406dcf17c /synapse/config/database.py | |
| parent | PEP8 (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-fb233dc40b3111e905e394e627b8ecc3b2a91e80.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
Diffstat (limited to 'synapse/config/database.py')
| -rw-r--r-- | synapse/config/database.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/config/database.py b/synapse/config/database.py index 0d33583a7d..daa161c952 100644 --- a/synapse/config/database.py +++ b/synapse/config/database.py @@ -20,7 +20,10 @@ import os class DatabaseConfig(Config): def __init__(self, args): super(DatabaseConfig, self).__init__(args) - self.database_path = self.abspath(args.database_path) + if args.database_path == ":memory:": + self.database_path = ":memory:" + else: + self.database_path = self.abspath(args.database_path) @classmethod def add_arguments(cls, parser): |