diff options
-rw-r--r-- | raven/base.py | 7 | ||||
-rw-r--r-- | tests/contrib/test_celery.py | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/raven/base.py b/raven/base.py index 876486c..949aaa3 100644 --- a/raven/base.py +++ b/raven/base.py @@ -439,8 +439,9 @@ class Client(object): not any(path.startswith(x) for x in self.exclude_paths) ) + transaction = None if not culprit: - culprit = self.transaction.peek() + transaction = self.transaction.peek() if not data.get('level'): data['level'] = kwargs.get('level') or logging.ERROR @@ -465,7 +466,9 @@ class Client(object): if site: data['tags'].setdefault('site', site) - if culprit: + if transaction: + data['transaction'] = transaction + elif culprit: data['culprit'] = culprit if fingerprint: diff --git a/tests/contrib/test_celery.py b/tests/contrib/test_celery.py index cfa5b0f..e5f0b91 100644 --- a/tests/contrib/test_celery.py +++ b/tests/contrib/test_celery.py @@ -33,7 +33,7 @@ class CeleryTestCase(TestCase): assert len(self.client.events) == 1 event = self.client.events[0] exception = event['exception']['values'][-1] - assert event['culprit'] == 'dummy_task' + assert event['transaction'] == 'dummy_task' assert exception['type'] == 'ZeroDivisionError' def test_ignore_expected(self): |