From 487bc49bf8dcaadd6abd9cee1ef762f1bf0d35a7 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 10 Aug 2016 13:39:12 +0100
Subject: [PATCH] Don't stop on 4xx series errors

---
 synapse/federation/federation_client.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 56115a87d7..9ba3151713 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -300,23 +300,13 @@ class FederationClient(FederationBase):
 
                         break
 
+                pdu_attempts[destination] = now
+
             except SynapseError as e:
                 logger.info(
                     "Failed to get PDU %s from %s because %s",
                     event_id, destination, e,
                 )
-                continue
-            except CodeMessageException as e:
-                if 400 <= e.code < 500 and e.code != 404:
-                    raise
-
-                pdu_attempts[destination] = now
-
-                logger.info(
-                    "Failed to get PDU %s from %s because %s",
-                    event_id, destination, e,
-                )
-                continue
             except NotRetryingDestination as e:
                 logger.info(e.message)
                 continue