diff options
| author | Erik Johnston <erik@matrix.org> | 2019-03-04 11:54:58 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-03-04 11:54:58 +0000 |
| commit | fbc047f2a5f12ee934e5ccbe7274100aa72166b5 (patch) | |
| tree | 2eabc4f13032883ff61fc635d0be43292a5ad131 /synapse/handlers/pagination.py | |
| parent | Update newsfile to have a full stop (diff) | |
| parent | Update test_typing to use HomeserverTestCase. (#4771) (diff) | |
| download | synapse-fbc047f2a5f12ee934e5ccbe7274100aa72166b5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_not_in_room
Diffstat (limited to 'synapse/handlers/pagination.py')
| -rw-r--r-- | synapse/handlers/pagination.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 9d257ecf31..e4fdae9266 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -136,7 +136,11 @@ class PaginationHandler(object): logger.info("[purge] complete") self._purges_by_id[purge_id].status = PurgeStatus.STATUS_COMPLETE except Exception: - logger.error("[purge] failed: %s", Failure().getTraceback().rstrip()) + f = Failure() + logger.error( + "[purge] failed", + exc_info=(f.type, f.value, f.getTracebackObject()), + ) self._purges_by_id[purge_id].status = PurgeStatus.STATUS_FAILED finally: self._purges_in_progress_by_room.discard(room_id) @@ -254,7 +258,7 @@ class PaginationHandler(object): }) state = None - if event_filter and event_filter.lazy_load_members(): + if event_filter and event_filter.lazy_load_members() and len(events) > 0: # TODO: remove redundant members # FIXME: we also care about invite targets etc. |