Merge pull request #2190 from matrix-org/erikj/mark_remote_as_back_more

Always mark remotes as up if we receive a signed request from them
This commit is contained in:
Erik Johnston 2017-05-05 14:08:12 +01:00 committed by GitHub
commit 27c28eaa27
2 changed files with 9 additions and 7 deletions

View file

@ -380,13 +380,6 @@ class FederationHandler(BaseHandler):
affected=event.event_id,
)
# if we're receiving valid events from an origin,
# it's probably a good idea to mark it as not in retry-state
# for sending (although this is a bit of a leap)
retry_timings = yield self.store.get_destination_retry_timings(origin)
if retry_timings and retry_timings["retry_last_ts"]:
self.store.set_destination_retry_timings(origin, 0, 0)
room = yield self.store.get_room(event.room_id)
if not room: