diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-12 23:23:32 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 23:23:32 +1000 |
| commit | 7ca097f77eba19403b4169e23404678aa2c7cd91 (patch) | |
| tree | f0c3403ad5a144a3fe066cf9dabdb649581fe5d8 /synapse/federation/federation_client.py | |
| parent | Merge pull request #3835 from krombel/fix_3821 (diff) | |
| download | synapse-7ca097f77eba19403b4169e23404678aa2c7cd91.tar.xz | |
Port federation/ to py3 (#3847)
Diffstat (limited to 'synapse/federation/federation_client.py')
| -rw-r--r-- | synapse/federation/federation_client.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index c9f3c2d352..fe67b2ff42 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -271,10 +271,10 @@ class FederationClient(FederationBase): event_id, destination, e, ) except NotRetryingDestination as e: - logger.info(e.message) + logger.info(str(e)) continue except FederationDeniedError as e: - logger.info(e.message) + logger.info(str(e)) continue except Exception as e: pdu_attempts[destination] = now @@ -510,7 +510,7 @@ class FederationClient(FederationBase): else: logger.warn( "Failed to %s via %s: %i %s", - description, destination, e.code, e.message, + description, destination, e.code, e.args[0], ) except Exception: logger.warn( @@ -875,7 +875,7 @@ class FederationClient(FederationBase): except Exception as e: logger.exception( "Failed to send_third_party_invite via %s: %s", - destination, e.message + destination, str(e) ) raise RuntimeError("Failed to send to any server.") |