Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services #2631

Merged
merged 3 commits into from
Nov 8, 2017
Merged

Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services #2631

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45fbe4f
Fix appservices being backlogged and not receiving new events due to …
xyzz Nov 2, 2017
8a4a0dd
Fix appservice tests to account for new behavior of notify_interested…
xyzz Nov 2, 2017
d46386d
Remove useless assignment in notify_interested_services
xyzz Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions synapse/handlers/appservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def notify_interested_services(self, current_id):
limit = 100
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would help avoid confusion if upper_bound = self.current_max above this line was removed

while True:
upper_bound, events = yield self.store.get_new_events_for_appservice(
upper_bound, limit
self.current_max, limit
)

if not events:
Expand Down Expand Up @@ -105,9 +105,6 @@ def notify_interested_services(self, current_id):
)

yield self.store.set_appservice_last_pos(upper_bound)

if len(events) < limit:
break
finally:
self.is_processing = False

Expand Down
15 changes: 12 additions & 3 deletions tests/handlers/test_appservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ def test_notify_interested_services(self):
type="m.room.message",
room_id="!foo:bar"
)
self.mock_store.get_new_events_for_appservice.return_value = (0, [event])
self.mock_store.get_new_events_for_appservice.side_effect = [
(0, [event]),
(0, [])
]
self.mock_as_api.push = Mock()
yield self.handler.notify_interested_services(0)
self.mock_scheduler.submit_event_for_as.assert_called_once_with(
Expand All @@ -75,7 +78,10 @@ def test_query_user_exists_unknown_user(self):
)
self.mock_as_api.push = Mock()
self.mock_as_api.query_user = Mock()
self.mock_store.get_new_events_for_appservice.return_value = (0, [event])
self.mock_store.get_new_events_for_appservice.side_effect = [
(0, [event]),
(0, [])
]
yield self.handler.notify_interested_services(0)
self.mock_as_api.query_user.assert_called_once_with(
services[0], user_id
Expand All @@ -98,7 +104,10 @@ def test_query_user_exists_known_user(self):
)
self.mock_as_api.push = Mock()
self.mock_as_api.query_user = Mock()
self.mock_store.get_new_events_for_appservice.return_value = (0, [event])
self.mock_store.get_new_events_for_appservice.side_effect = [
(0, [event]),
(0, [])
]
yield self.handler.notify_interested_services(0)
self.assertFalse(
self.mock_as_api.query_user.called,
Expand Down