Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix rejection of invites to unreachable servers #2145

Merged
merged 5 commits into from
Apr 24, 2017
Merged

Fix rejection of invites to unreachable servers #2145

merged 5 commits into from
Apr 24, 2017

Commits on Apr 21, 2017

  1. Fix some lies, and other clarifications, in docstrings 

    The documentation on get_json has been wrong ever since the very first commit
to synapse...
    @richvdh
    richvdh committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    4903ccf View commit details
    Browse the repository at this point in the history

  2. Remove redundant function 

    inline `reject_remote_invite`, which only existed to make tracing the callflow
more difficult.
    @richvdh
    richvdh committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    736b9a4 View commit details
    Browse the repository at this point in the history

  3. Broaden the conditions for locally_rejecting invites 

    The logic for marking invites as locally rejected was all well and good, but
didn't happen when the remote server returned a 500, or wasn't reachable, or
had no DNS, or whatever.

Just expand the except clause to catch everything.

Fixes #761.
    @richvdh
    richvdh committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    838810b View commit details
    Browse the repository at this point in the history

  4. Remove redundant try/except clauses 

    The `except SynapseError` clauses were pointless because the wrapped functions
would never throw a `SynapseError` (they either throw a `CodeMessageException`
or a `RuntimeError`).

The `except CodeMessageException` is now also pointless because the caller
treats all exceptions equally, so we may as well just throw the
`CodeMessageException`.
    @richvdh
    richvdh committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    0cdb32f View commit details
    Browse the repository at this point in the history

  5. Try harder when sending leave events 

    When we're rejecting invites, ignore the backoff data, so that we have a better
chance of not getting the room out of sync.
    @richvdh
    richvdh committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    91b3981 View commit details
    Browse the repository at this point in the history