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

Fix log line that was printing undefined value #6278

Merged
merged 5 commits into from
Oct 30, 2019
Merged

Fix log line that was printing undefined value #6278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba99b63
Fix log line that was printing undefined value
anoadragon453 Oct 29, 2019
0068c3f
Add changelog
anoadragon453 Oct 29, 2019
a544656
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/log…
anoadragon453 Oct 29, 2019
440417c
Apply suggestions from code review
anoadragon453 Oct 30, 2019
338f581
Change changelog from misc to bugfix
anoadragon453 Oct 30, 2019
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
1 change: 1 addition & 0 deletions changelog.d/6278.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix exception when remote servers attempt to join a room that they're not allowed to join.
2 changes: 1 addition & 1 deletion synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@ def on_make_join_request(self, origin, room_id, user_id):
builder=builder
)
except AuthError as e:
logger.warn("Failed to create join %r because %s", event, e)
logger.warn("Failed to create join to %s because %s", room_id, e)
raise e

event_allowed = yield self.third_party_event_rules.check_event_allowed(
Expand Down