diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-13 16:47:46 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 16:47:46 +1000 |
| commit | 99dd975dae7baaaef2a3b0a92fa51965b121ae34 (patch) | |
| tree | 31fff38e9be8ffb8d4407b02cdf9a07247a11f1b /synapse/handlers | |
| parent | Merge pull request #3679 from matrix-org/hawkowl/blackify-tests (diff) | |
| download | synapse-99dd975dae7baaaef2a3b0a92fa51965b121ae34.tar.xz | |
Run tests under PostgreSQL (#3423)
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/presence.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 20fc3b0323..3671d24f60 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -95,6 +95,7 @@ class PresenceHandler(object): Args: hs (synapse.server.HomeServer): """ + self.hs = hs self.is_mine = hs.is_mine self.is_mine_id = hs.is_mine_id self.clock = hs.get_clock() @@ -230,6 +231,10 @@ class PresenceHandler(object): earlier than they should when synapse is restarted. This affect of this is some spurious presence changes that will self-correct. """ + # If the DB pool has already terminated, don't try updating + if not self.hs.get_db_pool().running: + return + logger.info( "Performing _on_shutdown. Persisting %d unpersisted changes", len(self.user_to_current_state) |