diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 17:53:57 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 17:53:57 +0000 |
| commit | 9e937c28ee2013d01716a4647ddb8df34c7ec3cd (patch) | |
| tree | ddb7c3a62227bfa760b9c9c8fcd78359f4bc4636 /synapse/server.py | |
| parent | Don't restrict the tests to v1 rooms (diff) | |
| parent | Merge pull request #6420 from matrix-org/erikj/fix_find_next_generated_user_i... (diff) | |
| download | synapse-9e937c28ee2013d01716a4647ddb8df34c7ec3cd.tar.xz | |
Merge branch 'develop' into babolivier/message_retention
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): |