diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-01-27 14:00:11 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-01-29 17:05:33 +0000 |
| commit | b387ee17b68e4398a8fa26fdf122b773a046e429 (patch) | |
| tree | 840e680214beee50fe117150ddc1847db27d3be2 /synapse/storage/events.py | |
| parent | Merge pull request #2831 from matrix-org/rav/fix-userdir-search-again (diff) | |
| download | synapse-b387ee17b68e4398a8fa26fdf122b773a046e429.tar.xz | |
Improve exception handling in persist_event
1. use `deferred.errback()` instead of `deferred.errback(e)`, which means that a Failure object will be constructed using the current exception state, *including* its stack trace - so the stack trace is saved in the Failure, leading to better exception reports. 2. Set `consumeErrors=True` on the ObservableDeferred, because we know that there will always be at least one observer - which avoids a spurious "CRITICAL: unhandled exception in Deferred" error in the logs
Diffstat (limited to '')
| -rw-r--r-- | synapse/storage/events.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 7a9cd3ec90..33fccfa7a8 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -110,7 +110,7 @@ class _EventPeristenceQueue(object): end_item.events_and_contexts.extend(events_and_contexts) return end_item.deferred.observe() - deferred = ObservableDeferred(defer.Deferred()) + deferred = ObservableDeferred(defer.Deferred(), consumeErrors=True) queue.append(self._EventPersistQueueItem( events_and_contexts=events_and_contexts, @@ -152,8 +152,8 @@ class _EventPeristenceQueue(object): try: ret = yield per_item_callback(item) item.deferred.callback(ret) - except Exception as e: - item.deferred.errback(e) + except Exception: + item.deferred.errback() finally: queue = self._event_persist_queues.pop(room_id, None) if queue: |