Skip to content

Commit

Permalink
fix: register faulthandler on true stderr only (backport #26028) (#26034
Browse files Browse the repository at this point in the history
)

* fix: register faulthandler on true stderr only

#25613
(cherry picked from commit a49189a)

* fix: response logging

if response is 4xx then `Response` object itself is getting logged,
which is stupid. This is because of `res and res.text` and res is falsy
if response is not "OK".

(cherry picked from commit 4c85c20)

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
  • Loading branch information
mergify[bot] and ankush committed Apr 18, 2024
1 parent 334d353 commit bb0f1be
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
7 changes: 6 additions & 1 deletion frappe/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2506,7 +2506,12 @@ def wrapper(*args, **kwargs):


def _register_fault_handler():
faulthandler.register(signal.SIGUSR1)
import io
import sys

# Some libraries monkey patch stderr, we need actual fd
if isinstance(sys.stderr, io.TextIOWrapper):
faulthandler.register(signal.SIGUSR1, file=sys.stderr)


from frappe.utils.error import log_error
Expand Down
5 changes: 2 additions & 3 deletions frappe/integrations/doctype/webhook/test_webhook.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ def tearDownClass(cls):

def setUp(self):
# retrieve or create a User webhook for `after_insert`
self.responses = responses.RequestsMock()
self.responses.start()
webhook_fields = {
"webhook_doctype": "User",
"webhook_docevent": "after_insert",
Expand All @@ -101,9 +103,6 @@ def setUp(self):
self.test_user.first_name = "user1"
self.test_user.send_welcome_email = False

self.responses = responses.RequestsMock()
self.responses.start()

def tearDown(self) -> None:
self.user.delete()
self.test_user.delete()
Expand Down
2 changes: 1 addition & 1 deletion frappe/integrations/doctype/webhook/webhook.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def log_request(
"url": url,
"headers": frappe.as_json(headers) if headers else None,
"data": frappe.as_json(data) if data else None,
"response": res and res.text,
"response": res.text if res is not None else None,
"error": frappe.get_traceback(),
}
)
Expand Down

0 comments on commit bb0f1be

Please sign in to comment.