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

Always mark remotes as up if we receive a signed request from them #2190

Merged
merged 3 commits into from
May 5, 2017
Merged

Always mark remotes as up if we receive a signed request from them #2190

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db7d0c3
Always mark remotes as up if we receive a signed request from them
erikjohnston May 5, 2017
7b222fc
Remove redundant reset of destination timers
erikjohnston May 5, 2017
310b1cc
Use preserve_fn and add logs
erikjohnston May 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions synapse/federation/transport/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class Authenticator(object):
def __init__(self, hs):
self.keyring = hs.get_keyring()
self.server_name = hs.hostname
self.store = hs.get_datastore()

# A method just so we can pass 'self' as the authenticator to the Servlets
@defer.inlineCallbacks
Expand Down Expand Up @@ -138,6 +139,12 @@ def strip_quotes(value):
logger.info("Request from %s", origin)
request.authenticated_entity = origin

# If we get a valid signed request from the other side, its probably
# alive
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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it worth logging this?

Also: you need to either yield or preserve_fn on this I think


defer.returnValue(origin)


Expand Down
7 changes: 0 additions & 7 deletions synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,13 +380,6 @@ def _process_received_pdu(self, origin, pdu, state, auth_chain):
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:
Expand Down