Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed self targeting no parent bug #442

Merged
merged 2 commits into from
Jan 25, 2024
Merged

Fixed self targeting no parent bug #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1131b53
Fixed self targeting no parent bug
TheBurchLog Jan 25, 2024
2ac309c
formatting
TheBurchLog Jan 25, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Brewtils Changelog
TBD

- Fixed self reference bug that was returning back output instead of Request object.
- Fixed self reference bug, when SystemClient calls itself but doesn't have a current request it
now sends it to Beer Garden instead of attempting to process it locally.

3.23.0
------
Expand Down
5 changes: 4 additions & 1 deletion brewtils/rest/system_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,10 @@ def send_bg_request(self, *args, **kwargs):

# If not blocking just return the future
if not blocking:
if not self.target_self:
# TODO: Investigate if self targeting requests with no parents can be processed locally
if not self.target_self or not getattr(
brewtils.plugin.request_context, "current_request", None
):
return self._thread_pool.submit(
self._wait_for_request, request, raise_on_error, timeout
)
Expand Down
Loading