diff options
| author | Erik Johnston <erik@matrix.org> | 2021-09-08 13:59:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 12:59:15 +0000 |
| commit | 66d72b7e1794122126f297cda55ede3b16f19991 (patch) | |
| tree | ef8615bade379199ede3414aefea7b8895833612 | |
| parent | Request JSON for oEmbed requests (and ignore XML only providers). (#10759) (diff) | |
| download | synapse-66d72b7e1794122126f297cda55ede3b16f19991.tar.xz | |
Change logging of puppeted requests to better differentiate users (#10779)
This used to be a comma and got accidentally changed to a period in #9654, but a pipe character is more easier to parse visually.
| -rw-r--r-- | changelog.d/10779.misc | 1 | ||||
| -rw-r--r-- | synapse/http/site.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/10779.misc b/changelog.d/10779.misc new file mode 100644 index 0000000000..9275a83039 --- /dev/null +++ b/changelog.d/10779.misc @@ -0,0 +1 @@ +Change the format of authenticated users in logs when a user is being puppeted by and admin user. diff --git a/synapse/http/site.py b/synapse/http/site.py index 190084e8aa..c665a9d5db 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -384,7 +384,7 @@ class SynapseRequest(Request): # authenticated (e.g. and admin is puppetting a user) then we log both. requester, authenticated_entity = self.get_authenticated_entity() if authenticated_entity: - requester = f"{authenticated_entity}.{requester}" + requester = f"{authenticated_entity}|{requester}" self.site.access_logger.log( log_level, |