diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2019-01-24 21:31:54 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-24 21:31:54 +1100 |
commit | 58f6c4818337364dd9c6bf01062e7b0dadcb8a25 (patch) | |
tree | 505122b391e64d171dea79efb697ba1245d45010 /synapse/storage/pusher.py | |
parent | Don't send IP addresses as SNI (#4452) (diff) | |
download | synapse-58f6c4818337364dd9c6bf01062e7b0dadcb8a25.tar.xz |
Use native UPSERTs where possible (#4306)
Diffstat (limited to 'synapse/storage/pusher.py')
-rw-r--r-- | synapse/storage/pusher.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py index 2743b52bad..134297e284 100644 --- a/synapse/storage/pusher.py +++ b/synapse/storage/pusher.py @@ -215,7 +215,7 @@ class PusherStore(PusherWorkerStore): with self._pushers_id_gen.get_next() as stream_id: # no need to lock because `pushers` has a unique key on # (app_id, pushkey, user_name) so _simple_upsert will retry - newly_inserted = yield self._simple_upsert( + yield self._simple_upsert( table="pushers", keyvalues={ "app_id": app_id, @@ -238,7 +238,12 @@ class PusherStore(PusherWorkerStore): lock=False, ) - if newly_inserted: + user_has_pusher = self.get_if_user_has_pusher.cache.get( + (user_id,), None, update_metrics=False + ) + + if user_has_pusher is not True: + # invalidate, since we the user might not have had a pusher before yield self.runInteraction( "add_pusher", self._invalidate_cache_and_stream, |