summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-10-26 09:52:23 +0100
committerErik Johnston <erik@matrix.org>2018-10-26 09:52:23 +0100
commit9f2d14ee267348ee0c62565ec51b4263feab26c2 (patch)
tree6fb9f28a419a1c45589802fd83ea1983dd6dee04 /synapse/server.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentMerge pull request #4089 from dekonnection/master (diff)
downloadsynapse-9f2d14ee267348ee0c62565ec51b4263feab26c2.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py

index 3e9d3d8256..cf6b872cbd 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -207,6 +207,7 @@ class HomeServer(object): logger.info("Setting up.") with self.get_db_conn() as conn: self.datastore = self.DATASTORE_CLASS(conn, self) + conn.commit() logger.info("Finished setting up.") def get_reactor(self):