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

Fix using reactor as ip whitelist #9098

Merged
merged 4 commits into from
Jan 14, 2021
Merged

Fix using reactor as ip whitelist #9098

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95d0a87
Fix using reactor as ip whitelist
tzyl Jan 13, 2021
cced4da
Add changelog
tzyl Jan 13, 2021
8fecf36
Update changelog
tzyl Jan 14, 2021
60ded98
Empty commit to retrigger CI
tzyl Jan 14, 2021
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/9098.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix reactor being passsed as ip_whitelist to BlacklistingAgentWrapper from MatrixFederationAgent.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should rename this to misc since there's no outward facing bug that comes from this.

Suggested change
Fix reactor being passsed as ip_whitelist to BlacklistingAgentWrapper from MatrixFederationAgent.
Fix the wrong arguments being passed to `BlacklistingAgentWrapper` from `MatrixFederationAgent`.

You can add Contributed by <your name or handle>. if you'd like!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the changelog and renamed to 9098.misc!

1 change: 0 additions & 1 deletion synapse/http/federation/matrix_federation_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ def __init__(
pool=self._pool,
contextFactory=tls_client_options_factory,
),
self._reactor,
ip_blacklist=ip_blacklist,
),
user_agent=self.user_agent,
Expand Down