Skip to content

Commit 6c902a6

Browse files
committed
Revert ATOMIC_REQUESTS, fixes #541.
1 parent cdd6319 commit 6c902a6

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

api/views.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from Crypto.PublicKey import RSA
1010
from django.contrib.auth.models import AnonymousUser
1111
from django.contrib.auth.models import User
12+
from django.db import transaction
1213
from django.utils import timezone
1314
from guardian.shortcuts import assign_perm
1415
from guardian.shortcuts import get_objects_for_user
@@ -625,10 +626,11 @@ def rollback(self, request, *args, **kwargs):
625626
if version < 1:
626627
return Response(status=status.HTTP_404_NOT_FOUND)
627628
prev = app.release_set.get(version=version)
628-
summary = "{} rolled back to v{}".format(request.user, version)
629-
app.release_set.create(owner=request.user, version=last_version + 1,
630-
build=prev.build, config=prev.config,
631-
summary=summary)
629+
with transaction.atomic():
630+
summary = "{} rolled back to v{}".format(request.user, version)
631+
app.release_set.create(owner=request.user, version=last_version + 1,
632+
build=prev.build, config=prev.config,
633+
summary=summary)
632634
# publish release to registry as new docker image
633635
if settings.REGISTRY_URL:
634636
repository_path = "{}/{}".format(app.owner.username, app.id)

deis/settings.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,3 @@
329329
from .local_settings import * # @UnusedWildImport # noqa
330330
except ImportError:
331331
pass
332-
333-
# Ensure that atomic DB transactions per view are enabled
334-
DATABASES['default']['ATOMIC_REQUESTS'] = True

0 commit comments

Comments
 (0)