Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-12 08:14:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from matrix-org/in_memory_sqlite_for_testing

Browse Source 
Prepare the database whenever a connection is opened from the db_pool so...
This commit is contained in:
Mark Haines 2015-02-13 14:42:27 +00:00
commit fa662b52d0
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
synapse/app/homeserver.py
View File

@ -90,7 +90,9 @@ class SynapseHomeServer(HomeServer):
"sqlite3", self.get_db_name(), "sqlite3", self.get_db_name(),
check_same_thread=False, check_same_thread=False,
cp_min=1, cp_min=1,
cp_max=1 cp_max=1,
cp_openfun=prepare_database, # Prepare the database for each conn
# so that :memory: sqlite works
) )
def create_resource_tree(self, web_client, redirect_root_to_web_client): def create_resource_tree(self, web_client, redirect_root_to_web_client):
@ -252,14 +254,6 @@ def setup():
logger.info("Database prepared in %s.", db_name) logger.info("Database prepared in %s.", db_name)
db_pool = hs.get_db_pool()
if db_name == ":memory:":
# Memory databases will need to be setup each time they are opened.
reactor.callWhenRunning(
db_pool.runWithConnection, prepare_database
)
if config.manhole: if config.manhole:
f = twisted.manhole.telnet.ShellFactory() f = twisted.manhole.telnet.ShellFactory()
f.username = "matrix" f.username = "matrix"
@ -270,10 +264,10 @@ def setup():
bind_port = config.bind_port bind_port = config.bind_port
if config.no_tls: if config.no_tls:
bind_port = None bind_port = None
hs.start_listening(bind_port, config.unsecure_port) hs.start_listening(bind_port, config.unsecure_port)
hs.get_pusherpool().start() hs.get_pusherpool().start()
hs.get_state_handler().start_caching() hs.get_state_handler().start_caching()
hs.get_datastore().start_profiling() hs.get_datastore().start_profiling()

3
synapse/storage/__init__.py
View File

@ -637,10 +637,13 @@ def prepare_database(db_conn):
c.executescript(sql_script) c.executescript(sql_script)
db_conn.commit() db_conn.commit()
else:
logger.info("Database is at version %r", user_version)
else: else:
sql_script = "BEGIN TRANSACTION;\n" sql_script = "BEGIN TRANSACTION;\n"
for sql_loc in SCHEMAS: for sql_loc in SCHEMAS:
logger.debug("Applying schema %r", sql_loc)
sql_script += read_schema(sql_loc) sql_script += read_schema(sql_loc)
sql_script += "\n" sql_script += "\n"
sql_script += "COMMIT TRANSACTION;" sql_script += "COMMIT TRANSACTION;"