rei-mirrors
/
synapse
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply logging from hotfixes branch to develop (#15054) 

* Apply logging from hotfixes branch to develop

Part of #4826.

Originally added in #11882.

* Changelog
This commit is contained in:
David Robertson 2023-02-13 11:49:20 +00:00 committed by GitHub
parent 5e1b21e152
commit c10e131250
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/15054.misc Normal file
View File

@ -0,0 +1 @@
Merge debug logging from the hotfixes branch.

3
synapse/rest/client/account.py
View File

@ -415,6 +415,7 @@ class MsisdnThreepidRequestTokenRestServlet(RestServlet):
request, MsisdnRequestTokenBody request, MsisdnRequestTokenBody
) )
msisdn = phone_number_to_msisdn(body.country, body.phone_number) msisdn = phone_number_to_msisdn(body.country, body.phone_number)
logger.info("Request #%s to verify ownership of %s", body.send_attempt, msisdn)
if not await check_3pid_allowed(self.hs, "msisdn", msisdn): if not await check_3pid_allowed(self.hs, "msisdn", msisdn):
raise SynapseError( raise SynapseError(
@ -444,6 +445,7 @@ class MsisdnThreepidRequestTokenRestServlet(RestServlet):
await self.hs.get_clock().sleep(random.randint(1, 10) / 10) await self.hs.get_clock().sleep(random.randint(1, 10) / 10)
return 200, {"sid": random_string(16)} return 200, {"sid": random_string(16)}
logger.info("MSISDN %s is already in use by %s", msisdn, existing_user_id)
raise SynapseError(400, "MSISDN is already in use", Codes.THREEPID_IN_USE) raise SynapseError(400, "MSISDN is already in use", Codes.THREEPID_IN_USE)
if not self.hs.config.registration.account_threepid_delegate_msisdn: if not self.hs.config.registration.account_threepid_delegate_msisdn:
@ -468,6 +470,7 @@ class MsisdnThreepidRequestTokenRestServlet(RestServlet):
threepid_send_requests.labels(type="msisdn", reason="add_threepid").observe( threepid_send_requests.labels(type="msisdn", reason="add_threepid").observe(
body.send_attempt body.send_attempt
) )
logger.info("MSISDN %s: got response from identity server: %s", msisdn, ret)
return 200, ret return 200, ret