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

Jump to bottom

Swallow known error that happens in add_person_data #268

Merged
merged 2 commits into from
Jun 15, 2018
Merged

Swallow known error that happens in add_person_data #268

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff80f4c
Swallow known error that happens in add_person_data
rokob Jun 11, 2018
8447d28
clean up commented out other approach
rokob Jun 12, 2018
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
18 changes: 11 additions & 7 deletions rollbar/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,7 @@ def _report_exc_info(exc_info, request, extra_data, payload_data, level=None):
if extra_trace_data and not extra_data:
data['custom'] = extra_trace_data

request = _get_actual_request(request)
_add_request_data(data, request)
_add_person_data(data, request)
_add_lambda_context_data(data)
Expand Down Expand Up @@ -734,6 +735,7 @@ def _report_message(message, level, request, extra_data, payload_data):
extra_data = extra_data
data['body']['message'].update(extra_data)

request = _get_actual_request(request)
_add_request_data(data, request)
_add_person_data(data, request)
_add_lambda_context_data(data)
Expand Down Expand Up @@ -1013,6 +1015,15 @@ def _check_add_locals(frame, frame_num, total_frames):
('root' in SETTINGS and (frame.get('filename') or '').lower().startswith((SETTINGS['root'] or '').lower()))))


def _get_actual_request(request):
if WerkzeugLocalProxy and isinstance(request, WerkzeugLocalProxy):
try:
actual_request = request._get_current_object()
except RuntimeError:
return None
return actual_request
return request

def _build_request_data(request):
"""
Returns a dictionary containing data from the request.
Expand All @@ -1035,13 +1046,6 @@ def _build_request_data(request):
if WerkzeugRequest and isinstance(request, WerkzeugRequest):
return _build_werkzeug_request_data(request)

if WerkzeugLocalProxy and isinstance(request, WerkzeugLocalProxy):
try:
actual_request = request._get_current_object()
except RuntimeError:
return None
return _build_werkzeug_request_data(actual_request)

# tornado
if TornadoRequest and isinstance(request, TornadoRequest):
return _build_tornado_request_data(request)
Expand Down