diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-04 14:50:24 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-04 14:50:24 +0100 |
| commit | dfaa58f72d3455affcac58c8b604d21935183e88 (patch) | |
| tree | 9e813d30b0dd8e6491da7236fef0068d46aa9e3a | |
| parent | Add new storage functions to slave store (diff) | |
| download | synapse-dfaa58f72d3455affcac58c8b604d21935183e88.tar.xz | |
Fix comment and num args
Diffstat (limited to '')
| -rw-r--r-- | synapse/state.py | 2 | ||||
| -rw-r--r-- | synapse/storage/roommember.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/state.py b/synapse/state.py index f8b18a4a2d..02fee47f39 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -179,7 +179,7 @@ class StateHandler(object): def get_current_hosts_in_room(self, room_id, latest_event_ids=None): if not latest_event_ids: latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id) - logger.debug("calling resolve_state_groups from get_current_user_in_room") + logger.debug("calling resolve_state_groups from get_current_hosts_in_room") entry = yield self.resolve_state_groups(room_id, latest_event_ids) joined_hosts = yield self.store.get_joined_hosts( room_id, entry.state_id, entry.state diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 1c0fa8a680..c571da2ce4 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -494,7 +494,7 @@ class RoomMemberStore(SQLBaseStore): room_id, state_group, state_ids ) - @cachedInlineCallbacks(num_args=3) + @cachedInlineCallbacks(num_args=2) def _get_joined_hosts(self, room_id, state_group, current_state_ids): # We don't use `state_group`, its there so that we can cache based # on it. However, its important that its never None, since two current_state's |