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.

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

exception_level_filters: support string for filtered class name #38

Merged
merged 3 commits into from
Dec 9, 2014
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
11 changes: 10 additions & 1 deletion rollbar/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,16 @@ def prev_page(self):


def _filtered_level(exception):
for cls, level in SETTINGS['exception_level_filters']:
for i, item in enumerate(SETTINGS['exception_level_filters']):
cls, level = item
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 it might be a good idea to break the body of the for loop out into its own function. Otherwise the continue part of the logic is easy to overlook / a little hard to reason about (had me confused for a bit).

if isinstance(cls, str):
# Lazily resolve class name
parts = cls.split('.')
module = ".".join(parts[:-1])
if module not in sys.modules or not hasattr(sys.modules[module], parts[-1]):
continue
cls = getattr(sys.modules[module], parts[-1])
SETTINGS['exception_level_filters'][i] = (cls, level)
if isinstance(exception, cls):
return level

Expand Down
42 changes: 42 additions & 0 deletions rollbar/test/test_rollbar.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import copy
import exceptions
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 this is breaking things in python 3 (note the test failures). See https://groups.google.com/forum/#!topic/django-users/hCqNuEQKwso

import mock
import unittest
import urllib

import rollbar
Expand Down Expand Up @@ -114,6 +116,43 @@ def _raise():
self.assertNotIn('args', payload['data']['body']['trace']['frames'][-1])
self.assertNotIn('kwargs', payload['data']['body']['trace']['frames'][-1])

@mock.patch('rollbar.send_payload')
def test_exception_filters(self, send_payload):

rollbar.SETTINGS['exception_level_filters'] = [
(exceptions.OSError, 'ignored'),
('exceptions.NotImplementedError', 'ignored'),
('bogus.DoesntExist', 'ignored'),
]

def _raise_exception():
try:
raise Exception('foo')
except:
rollbar.report_exc_info()

def _raise_os_error():
try:
raise OSError('bar')
except:
rollbar.report_exc_info()

def _raise_not_implemented_error():
try:
raise NotImplementedError('bar')
except:
rollbar.report_exc_info()

_raise_exception()
self.assertTrue(send_payload.called)

_raise_os_error()
self.assertEqual(1, send_payload.call_count)

_raise_not_implemented_error()
self.assertEqual(1, send_payload.call_count)


@mock.patch('rollbar.send_payload')
def test_report_messsage(self, send_payload):
rollbar.report_message('foo')
Expand Down Expand Up @@ -714,3 +753,6 @@ def step2():
def called_with(arg1):
arg1 = 'changed'
step1()

if __name__ == '__main__':
unittest.main()