summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cramer <dcramer@gmail.com>2013-11-28 02:20:16 -0800
committerDavid Cramer <dcramer@gmail.com>2013-11-28 02:20:16 -0800
commit8d680b5969894c7d5f002f55d7a6fb0735beea09 (patch)
treeaa9cb92668a23b298c2bea53893706d5bedc93d8
parent684d20dec42d9517a71ab6f0a020146b2938ff6b (diff)
downloadraven-8d680b5969894c7d5f002f55d7a6fb0735beea09.tar.gz
Support for atomic transactions (Django 1.6)
-rw-r--r--raven/contrib/django/models.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/raven/contrib/django/models.py b/raven/contrib/django/models.py
index c6be79e..a41ee57 100644
--- a/raven/contrib/django/models.py
+++ b/raven/contrib/django/models.py
@@ -175,8 +175,13 @@ def register_handlers():
# HACK: support Sentry's internal communication
if 'sentry' in django_settings.INSTALLED_APPS:
from django.db import transaction
+ # Django 1.6
+ if hasattr(transaction, 'atomic'):
+ commit_on_success = transaction.atomic
+ else:
+ commit_on_success = transaction.commit_on_success
- @transaction.commit_on_success
+ @commit_on_success
def wrap_sentry(request, **kwargs):
if transaction.is_dirty():
transaction.rollback()