tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Allow ':memory:' as the database path for sqlite3

Browse source
This commit is contained in:
Mark Haines 2015-01-19 15:26:19 +00:00
parent 5fed042640
commit 3e85e52b3f
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
synapse/app/homeserver.py
View file

@ -247,7 +247,13 @@ def setup():
logger.info("Database prepared in %s.", db_name)
hs.get_db_pool()
db_pool = hs.get_db_pool()
if db_name == ":memory:"
# Memory databases will need to be setup each time they are opened.
reactor.callWhenRunning(
hs.get_db_pool().runWithConnection, prepare_database
)
if config.manhole:
f = twisted.manhole.telnet.ShellFactory()

5
synapse/config/database.py
View file

@ -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):