diff --git a/django_q/monitor.py b/django_q/monitor.py index 3a0dcec..96c8308 100644 --- a/django_q/monitor.py +++ b/django_q/monitor.py @@ -82,9 +82,12 @@ def monitor(run_once=False, broker=None): i += 1 # bottom bar i += 1 + queue_size = broker.queue_size() + if Conf.ORM: + queue_size = '{}({})'.format(queue_size, broker.lock_size()) print(term.move(i, 0) + term.white_on_cyan(term.center(broker.info(), width=col_width * 2))) print(term.move(i, 2 * col_width) + term.black_on_cyan(term.center(_('Queued'), width=col_width))) - print(term.move(i, 3 * col_width) + term.white_on_cyan(term.center(broker.queue_size(), width=col_width))) + print(term.move(i, 3 * col_width) + term.white_on_cyan(term.center(queue_size, width=col_width))) print(term.move(i, 4 * col_width) + term.black_on_cyan(term.center(_('Success'), width=col_width))) print(term.move(i, 5 * col_width) + term.white_on_cyan( term.center(models.Success.objects.count(), width=col_width))) diff --git a/django_q/tests/test_monitor.py b/django_q/tests/test_monitor.py index e1a3ac0..69d9af5 100644 --- a/django_q/tests/test_monitor.py +++ b/django_q/tests/test_monitor.py @@ -4,6 +4,7 @@ from django_q import async from django_q.cluster import Cluster from django_q.monitor import monitor, info from django_q.status import Stat +from django_q.conf import Conf @pytest.mark.django_db @@ -22,6 +23,10 @@ def test_monitor(): assert stat.empty_queues() is True break assert found_c is True + # test lock size for orm broker + Conf.ORM = 'default' + monitor(run_once=True) + Conf.ORM = None @pytest.mark.django_db