diff options
author | Neil Johnson <neil@matrix.org> | 2018-10-25 16:33:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-25 16:33:40 +0100 |
commit | 95ad12885134ab1cdd0b21f1e0274e588220f681 (patch) | |
tree | 754bb889ef44463125e6dc9c4dceb07c9949fa81 /synapse/server.py | |
parent | Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin (diff) | |
parent | add new line (diff) | |
download | synapse-95ad12885134ab1cdd0b21f1e0274e588220f681.tar.xz |
Merge pull request #4081 from matrix-org/neilj/fix_mau_init
fix race condiftion in calling initialise_reserved_users
Diffstat (limited to 'synapse/server.py')
-rw-r--r-- | synapse/server.py | 1 |
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): |