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

fix: Change retry logic to extract next run from traceback #111

Merged
merged 1 commit into from
Mar 15, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
27 changes: 24 additions & 3 deletions celery_progress/backend.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import datetime
import logging
import re
from abc import ABCMeta, abstractmethod
from decimal import Decimal

Expand Down Expand Up @@ -76,9 +77,29 @@ def get_info(self):
elif state in ['RETRY', 'REVOKED']:
if state == 'RETRY':
retry = info
when = str(retry.when) if isinstance(retry.when, datetime.datetime) else str(
datetime.datetime.now() + datetime.timedelta(seconds=retry.when))
result = {'when': when, 'message': retry.message or str(retry.exc)}
try:
iter(retry)
when = (
str(retry.when)
if isinstance(retry.when, datetime.datetime)
else str(
datetime.datetime.now()
+ datetime.timedelta(seconds=retry.when)
)
)
result = {"when": when, "message": retry.message or str(retry.exc)}
except:
traceback = task_meta.get("traceback")
seconds = re.search("\d{1,10}s", traceback)
if seconds:
when = str(
task_meta["date_done"]
+ datetime.timedelta(seconds=int(seconds.group()[:-1]))
)
else:
when = "Unknown" # Can't find the retry time

result = {"when": when, "message": f"{str(task_meta['result'])[0:50]}..."}
else:
result = 'Task ' + str(info)
response.update({
Expand Down
5 changes: 3 additions & 2 deletions celery_progress/static/celery_progress/celery_progress.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ class CeleryProgressBar {
onRetryDefault(progressBarElement, progressBarMessageElement, excMessage, retryWhen) {
retryWhen = new Date(retryWhen);
let message = 'Retrying in ' + Math.round((retryWhen.getTime() - Date.now())/1000) + 's: ' + excMessage;
this.onError(progressBarElement, progressBarMessageElement, message);
progressBarElement.style.backgroundColor = this.barColors.error;
progressBarMessageElement.textContent = message;
}

onIgnoredDefault(progressBarElement, progressBarMessageElement, result) {
Expand Down Expand Up @@ -163,7 +164,7 @@ class CeleryProgressBar {
this.onHttpError(this.progressBarElement, this.progressBarMessageElement, "HTTP Code " + response.status, response);
}
}

static getBarColorsDefault() {
return {
success: '#76ce60',
Expand Down