summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-03-14 09:42:27 +0000
committerGitHub <noreply@github.com>2018-03-14 09:42:27 +0000
commit3e839e0548684fc27ff6cb3f966162e5194e7487 (patch)
tree8200bf2706c13cf849863534d2fe413a11171f33
parentMerge pull request #2988 from matrix-org/erikj/split_profile_store (diff)
parentOnly update remote profile cache on master (diff)
downloadsynapse-3e839e0548684fc27ff6cb3f966162e5194e7487.tar.xz
Merge pull request #2989 from matrix-org/erikj/profile_cache_master
Only update remote profile cache on master
-rw-r--r--synapse/handlers/profile.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py
index cb710fe796..3465a787ab 100644
--- a/synapse/handlers/profile.py
+++ b/synapse/handlers/profile.py
@@ -38,7 +38,10 @@ class ProfileHandler(BaseHandler):
 
         self.user_directory_handler = hs.get_user_directory_handler()
 
-        self.clock.looping_call(self._update_remote_profile_cache, self.PROFILE_UPDATE_MS)
+        if hs.config.worker_app is None:
+            self.clock.looping_call(
+                self._update_remote_profile_cache, self.PROFILE_UPDATE_MS,
+            )
 
     @defer.inlineCallbacks
     def get_profile(self, user_id):