Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2019-10-25 11:34:49 +01:00
parent a71b8c87ec 87259b3a3a
commit 64c2cfda8a
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6255.misc Normal file
View File

@ -0,0 +1 @@
Small performance improvement by removing repeated config lookups in room stats calculation.

4
synapse/handlers/stats.py
View File

@ -45,6 +45,8 @@ class StatsHandler(StateDeltasHandler):
self.is_mine_id = hs.is_mine_id self.is_mine_id = hs.is_mine_id
self.stats_bucket_size = hs.config.stats_bucket_size self.stats_bucket_size = hs.config.stats_bucket_size
self.stats_enabled = hs.config.stats_enabled
# The current position in the current_state_delta stream # The current position in the current_state_delta stream
self.pos = None self.pos = None
@ -61,7 +63,7 @@ class StatsHandler(StateDeltasHandler):
def notify_new_event(self): def notify_new_event(self):
"""Called when there may be more deltas to process """Called when there may be more deltas to process
""" """
if not self.hs.config.stats_enabled or self._is_processing: if not self.stats_enabled or self._is_processing:
return return
self._is_processing = True self._is_processing = True

2
tests/handlers/test_stats.py
View File

@ -607,6 +607,7 @@ class StatsRoomTests(unittest.HomeserverTestCase):
""" """
self.hs.config.stats_enabled = False self.hs.config.stats_enabled = False
self.handler.stats_enabled = False
u1 = self.register_user("u1", "pass") u1 = self.register_user("u1", "pass")
u1token = self.login("u1", "pass") u1token = self.login("u1", "pass")
@ -618,6 +619,7 @@ class StatsRoomTests(unittest.HomeserverTestCase):
self.assertIsNone(self._get_current_stats("user", u1)) self.assertIsNone(self._get_current_stats("user", u1))
self.hs.config.stats_enabled = True self.hs.config.stats_enabled = True
self.handler.stats_enabled = True
self._perform_background_initial_update() self._perform_background_initial_update()