mirror of
https://github.com/element-hq/synapse
synced 2024-09-12 09:25:11 +00:00
make FederationHandler._handle_new_event async
This commit is contained in:
parent
c556ed9e15
commit
1cdc253e0a
1 changed files with 7 additions and 6 deletions
|
@ -1782,11 +1782,10 @@ class FederationHandler(BaseHandler):
|
||||||
def get_min_depth_for_context(self, context):
|
def get_min_depth_for_context(self, context):
|
||||||
return self.store.get_min_depth(context)
|
return self.store.get_min_depth(context)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
async def _handle_new_event(
|
||||||
def _handle_new_event(
|
|
||||||
self, origin, event, state=None, auth_events=None, backfilled=False
|
self, origin, event, state=None, auth_events=None, backfilled=False
|
||||||
):
|
):
|
||||||
context = yield self._prep_event(
|
context = await self._prep_event(
|
||||||
origin, event, state=state, auth_events=auth_events, backfilled=backfilled
|
origin, event, state=state, auth_events=auth_events, backfilled=backfilled
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -1799,11 +1798,11 @@ class FederationHandler(BaseHandler):
|
||||||
and not backfilled
|
and not backfilled
|
||||||
and not context.rejected
|
and not context.rejected
|
||||||
):
|
):
|
||||||
yield self.action_generator.handle_push_actions_for_event(
|
await self.action_generator.handle_push_actions_for_event(
|
||||||
event, context
|
event, context
|
||||||
)
|
)
|
||||||
|
|
||||||
yield self.persist_events_and_notify(
|
await self.persist_events_and_notify(
|
||||||
[(event, context)], backfilled=backfilled
|
[(event, context)], backfilled=backfilled
|
||||||
)
|
)
|
||||||
success = True
|
success = True
|
||||||
|
@ -2296,7 +2295,9 @@ class FederationHandler(BaseHandler):
|
||||||
logger.debug(
|
logger.debug(
|
||||||
"do_auth %s missing_auth: %s", event.event_id, e.event_id
|
"do_auth %s missing_auth: %s", event.event_id, e.event_id
|
||||||
)
|
)
|
||||||
yield self._handle_new_event(origin, e, auth_events=auth)
|
yield defer.ensureDeferred(
|
||||||
|
self._handle_new_event(origin, e, auth_events=auth)
|
||||||
|
)
|
||||||
|
|
||||||
if e.event_id in event_auth_events:
|
if e.event_id in event_auth_events:
|
||||||
auth_events[(e.type, e.state_key)] = e
|
auth_events[(e.type, e.state_key)] = e
|
||||||
|
|
Loading…
Reference in a new issue