diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-05 13:50:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-05 13:50:28 +0000 |
| commit | 8f5b858a1bcce1c62c08be731391d6ad701675dd (patch) | |
| tree | d1f0646f53488933de7b96055e8b302ccb2372d0 /synapse | |
| parent | Connection errors in twisted aren't RuntimeErrors (diff) | |
| parent | SYN-202: Log as WARN the 404 'Presence information not visible' errors instea... (diff) | |
| download | synapse-8f5b858a1bcce1c62c08be731391d6ad701675dd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_client_retries
Diffstat (limited to '')
| -rw-r--r-- | synapse/handlers/message.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 6fbd2af4ab..3f51f38f18 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -16,7 +16,7 @@ from twisted.internet import defer from synapse.api.constants import EventTypes, Membership -from synapse.api.errors import RoomError +from synapse.api.errors import RoomError, SynapseError from synapse.streams.config import PaginationConfig from synapse.events.utils import serialize_event from synapse.events.validator import EventValidator @@ -372,10 +372,17 @@ class MessageHandler(BaseHandler): as_event=True, ) presence.append(member_presence) - except Exception: - logger.exception( - "Failed to get member presence of %r", m.user_id - ) + except SynapseError as e: + if e.code == 404: + # FIXME: We are doing this as a warn since this gets hit a + # lot and spams the logs. Why is this happening? + logger.warn( + "Failed to get member presence of %r", m.user_id + ) + else: + logger.exception( + "Failed to get member presence of %r", m.user_id + ) time_now = self.clock.time_msec() |