CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-07 15:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix celery serialization issues

Browse Source
This commit is contained in:
Raphael Michel
2018-01-01 22:41:16 +01:00
parent 9a18eda404
commit fa211574a2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/base/services/orders.py
View File

@@ -1107,7 +1107,7 @@ def perform_order(self, event: str, payment_provider: str, positions: List[str],
except LockTimeoutException: except LockTimeoutException:
self.retry() self.retry()
except (MaxRetriesExceededError, LockTimeoutException): except (MaxRetriesExceededError, LockTimeoutException):
return OrderError(error_messages['busy']) raise OrderError(str(error_messages['busy']))
@app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1, throws=(OrderError,)) @app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1, throws=(OrderError,))
@@ -1116,6 +1116,6 @@ def cancel_order(self, order: int, user: int=None, send_mail: bool=True, api_tok
try: try:
return _cancel_order(order, user, send_mail, api_token) return _cancel_order(order, user, send_mail, api_token)
except LockTimeoutException: except LockTimeoutException:
self.retry(exc=OrderError(error_messages['busy'])) self.retry()
except (MaxRetriesExceededError, LockTimeoutException): except (MaxRetriesExceededError, LockTimeoutException):
return OrderError(error_messages['busy']) raise OrderError(error_messages['busy'])