diff --git a/django_q/management/commands/qinfo.py b/django_q/management/commands/qinfo.py new file mode 100644 index 0000000..d66772a --- /dev/null +++ b/django_q/management/commands/qinfo.py @@ -0,0 +1,12 @@ +from django.core.management.base import BaseCommand +from django.utils.translation import ugettext as _ + +from django_q.monitor import info + + +class Command(BaseCommand): + # Translators: help text for qinfo management command + help = _('General information over all clusters.') + + def handle(self, *args, **options): + info() diff --git a/django_q/management/commands/qmonitor.py b/django_q/management/commands/qmonitor.py index efab457..bef4bd1 100644 --- a/django_q/management/commands/qmonitor.py +++ b/django_q/management/commands/qmonitor.py @@ -1,10 +1,9 @@ -# Django from optparse import make_option from django.core.management.base import BaseCommand from django.utils.translation import ugettext as _ -from django_q.monitor import monitor, info +from django_q.monitor import monitor class Command(BaseCommand): @@ -17,16 +16,7 @@ class Command(BaseCommand): dest='run_once', default=False, help='Run once and then stop.'), - make_option('-i', '--info', - action='store_true', - dest='info', - default=False, - help='Lists general information over all clusters. ') ) def handle(self, *args, **options): - if options.get('info', False): - info() - else: - monitor(run_once=options.get('run_once', False)) - + monitor(run_once=options.get('run_once', False)) diff --git a/django_q/monitor.py b/django_q/monitor.py index fa88f7d..f009cf9 100644 --- a/django_q/monitor.py +++ b/django_q/monitor.py @@ -201,7 +201,7 @@ def info(r=redis_client): reincarnations += cluster.reincarnations term.clear_eos() col_width = int(term.width / 6) - print(term.black_on_green(term.center(_('-- {} clusters summary --').format(Conf.PREFIX)))) + print(term.black_on_green(term.center(_('-- {} summary --').format(Conf.PREFIX)))) print(term.cyan(_('Clusters')) + term.move_x(1 * col_width) + term.white(str(clusters)) + diff --git a/django_q/tests/test_commands.py b/django_q/tests/test_commands.py index 7dc9498..84e80a6 100644 --- a/django_q/tests/test_commands.py +++ b/django_q/tests/test_commands.py @@ -6,7 +6,12 @@ from django.core.management import call_command def test_qcluster(): call_command('qcluster', run_once=True) + @pytest.mark.django_db def test_qmonitor(): call_command('qmonitor', run_once=True) - call_command('qmonitor', info=True) + + +@pytest.mark.django_db +def test_qinfo(): + call_command('qinfo') diff --git a/django_q/tests/test_monitor.py b/django_q/tests/test_monitor.py index 673ba8a..797a5a0 100644 --- a/django_q/tests/test_monitor.py +++ b/django_q/tests/test_monitor.py @@ -2,7 +2,7 @@ import pytest import redis from django_q.cluster import Cluster -from django_q.monitor import monitor, Stat, info, ping_redis +from django_q.monitor import monitor, Stat, ping_redis def test_monitor():