Display error when not able to retrieve tasks.
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
from __future__ import absolute_import, unicode_literals
|
from __future__ import absolute_import, unicode_literals
|
||||||
|
|
||||||
|
from django.contrib import messages
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from common.generics import SingleObjectListView
|
from common.generics import SingleObjectListView
|
||||||
@@ -32,9 +33,19 @@ class QueueActiveTaskListView(SingleObjectListView):
|
|||||||
def get_object(self):
|
def get_object(self):
|
||||||
return CeleryQueue.get(queue_name=self.kwargs['queue_name'])
|
return CeleryQueue.get(queue_name=self.kwargs['queue_name'])
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_task_list(self):
|
||||||
return self.get_object().get_active_tasks()
|
return self.get_object().get_active_tasks()
|
||||||
|
|
||||||
|
def get_queryset(self):
|
||||||
|
try:
|
||||||
|
return self.get_task_list()
|
||||||
|
except Exception as exception:
|
||||||
|
messages.error(
|
||||||
|
self.request,
|
||||||
|
_('Unable to retrieve task list; %s') % exception
|
||||||
|
)
|
||||||
|
return ()
|
||||||
|
|
||||||
|
|
||||||
class QueueScheduledTaskListView(QueueActiveTaskListView):
|
class QueueScheduledTaskListView(QueueActiveTaskListView):
|
||||||
def get_extra_context(self):
|
def get_extra_context(self):
|
||||||
@@ -44,7 +55,7 @@ class QueueScheduledTaskListView(QueueActiveTaskListView):
|
|||||||
'title': _('Scheduled tasks in queue: %s') % self.get_object()
|
'title': _('Scheduled tasks in queue: %s') % self.get_object()
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_task_list(self):
|
||||||
return self.get_object().get_scheduled_tasks()
|
return self.get_object().get_scheduled_tasks()
|
||||||
|
|
||||||
|
|
||||||
@@ -56,5 +67,5 @@ class QueueReservedTaskListView(QueueActiveTaskListView):
|
|||||||
'title': _('Reserved tasks in queue: %s') % self.get_object()
|
'title': _('Reserved tasks in queue: %s') % self.get_object()
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_task_list(self):
|
||||||
return self.get_object().get_reserved_tasks()
|
return self.get_object().get_reserved_tasks()
|
||||||
|
|||||||
Reference in New Issue
Block a user