rename config var to max_retries, remove attempt_count form admin , add admin ui customization to docs

This commit is contained in:
Tim O'Meara
2020-08-13 11:58:00 -05:00
parent 991cca5844
commit 655f0aadb5
7 changed files with 32 additions and 11 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ retry_failed.short_description = _("Resubmit selected tasks to queue")
class FailAdmin(admin.ModelAdmin):
"""model admin for failed tasks."""
list_display = ("name", "func", "started", "stopped", "short_result", "attempt_count")
list_display = ("name", "func", "started", "stopped", "short_result")
def has_add_permission(self, request):
"""Don't allow adds."""
+1 -1
View File
@@ -481,7 +481,7 @@ def save_task(task, broker: Broker):
existing_task.attempt_count = existing_task.attempt_count + 1
existing_task.save()
if 0 < Conf.ATTEMPT_COUNT == existing_task.attempt_count:
if Conf.MAX_ATTEMPTS > 0 and existing_task.attempt_count >= Conf.MAX_ATTEMPTS:
broker.acknowledge(task['ack_id'])
else:
+1 -1
View File
@@ -165,7 +165,7 @@ class Conf:
ERROR_REPORTER = conf.get("error_reporter", {})
# Optional attempt count. set to 0 for infinite attempts
ATTEMPT_COUNT = conf.get('attempt_count', 0)
MAX_ATTEMPTS = conf.get('max_attempts', 0)
# OSX doesn't implement qsize because of missing sem_getvalue()
try:
+2 -4
View File
@@ -21,8 +21,7 @@ def test_admin_views(admin_client, monkeypatch):
func='test.fail',
started=timezone.now(),
stopped=timezone.now(),
success=False,
attempt_count=1)
success=False)
tag = uuid()
t = Task.objects.create(
id=tag[1],
@@ -30,8 +29,7 @@ def test_admin_views(admin_client, monkeypatch):
func='test.success',
started=timezone.now(),
stopped=timezone.now(),
success=True,
attempt_count=1)
success=True)
q = OrmQ.objects.create(
key='test',
payload=SignedPackage.dumps({'id': 1, 'func': 'test', 'name': 'test'}))
+1 -1
View File
@@ -399,7 +399,7 @@ def test_bad_secret(broker, monkeypatch):
@pytest.mark.django_db
def test_attempt_count(broker, monkeypatch):
monkeypatch.setattr(Conf, 'ATTEMPT_COUNT', 3)
monkeypatch.setattr(Conf, 'MAX_ATTEMPTS', 3)
tag = uuid()
task = {'id': tag[1],
'name': tag[0],