diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-03-01 16:47:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 16:47:12 +0000 |
| commit | 30649529398a2a57c52b6878a5753a5bf650cf25 (patch) | |
| tree | 29e8b81737a3f336cf4afc46fe8102b2664bc172 | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-30649529398a2a57c52b6878a5753a5bf650cf25.tar.xz | |
Fix incorrect log about not persisting duplicate state event. (#4776)
We were logging this when it was not true.
| -rw-r--r-- | changelog.d/4776.bugfix | 1 | ||||
| -rw-r--r-- | synapse/handlers/message.py | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/changelog.d/4776.bugfix b/changelog.d/4776.bugfix new file mode 100644 index 0000000000..ce3e6ce33c --- /dev/null +++ b/changelog.d/4776.bugfix @@ -0,0 +1 @@ +Fix incorrect log about not persisting duplicate state event. diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 3981fe69ce..c762b58902 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -436,10 +436,11 @@ class EventCreationHandler(object): if event.is_state(): prev_state = yield self.deduplicate_state_event(event, context) - logger.info( - "Not bothering to persist duplicate state event %s", event.event_id, - ) if prev_state is not None: + logger.info( + "Not bothering to persist state event %s duplicated by %s", + event.event_id, prev_state.event_id, + ) defer.returnValue(prev_state) yield self.handle_new_client_event( |