Skip to content
Snippets Groups Projects
Unverified Commit 7bf2d6c2 authored by Andrew Morgan's avatar Andrew Morgan Committed by GitHub
Browse files

Partially revert #11675; prevent attempting to create pushers on workers (#11770)

parent 56834ab7
No related branches found
No related tags found
No related merge requests found
Add a flag to the `synapse_review_recent_signups` script to ignore and filter appservice users.
\ No newline at end of file
...@@ -979,18 +979,16 @@ class RegistrationHandler: ...@@ -979,18 +979,16 @@ class RegistrationHandler:
if ( if (
self.hs.config.email.email_enable_notifs self.hs.config.email.email_enable_notifs
and self.hs.config.email.email_notif_for_new_users and self.hs.config.email.email_notif_for_new_users
and token
): ):
# Pull the ID of the access token back out of the db # Pull the ID of the access token back out of the db
# It would really make more sense for this to be passed # It would really make more sense for this to be passed
# up when the access token is saved, but that's quite an # up when the access token is saved, but that's quite an
# invasive change I'd rather do separately. # invasive change I'd rather do separately.
if token: user_tuple = await self.store.get_user_by_access_token(token)
user_tuple = await self.store.get_user_by_access_token(token) # The token better still exist.
# The token better still exist. assert user_tuple
assert user_tuple token_id = user_tuple.token_id
token_id = user_tuple.token_id
else:
token_id = None
await self.pusher_pool.add_pusher( await self.pusher_pool.add_pusher(
user_id=user_id, user_id=user_id,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment