diff options
| author | Erik Johnston <erik@matrix.org> | 2019-11-05 10:27:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-11-05 10:27:41 +0000 |
| commit | ffe595381d508bc4b7ff1acbfb03b8d280da03a3 (patch) | |
| tree | d9dac65c36d01814fdd97d78f0d4315b38ba30ad /synapse/server.py | |
| parent | Change to not require a state_groups.room_id index. (diff) | |
| parent | Remove the psutil dependency (#6318) (diff) | |
| download | synapse-ffe595381d508bc4b7ff1acbfb03b8d280da03a3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index f8aeebcff8..90c3b072e8 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -221,6 +221,7 @@ class HomeServer(object): self.hostname = hostname self._building = {} self._listening_services = [] + self.start_time = None self.clock = Clock(reactor) self.distributor = Distributor() @@ -240,6 +241,7 @@ class HomeServer(object): datastore = self.DATASTORE_CLASS(conn, self) self.datastores = DataStores(datastore, conn, self) conn.commit() + self.start_time = int(self.get_clock().time()) logger.info("Finished setting up.") def setup_master(self): |