From c244075195dc64f029ccf512a2da86d866e9d200 Mon Sep 17 00:00:00 2001 From: Ilan Date: Mon, 27 Jul 2015 18:08:32 +0200 Subject: [PATCH 1/6] Bumping to 0.4.4 --- django_q/__init__.py | 2 +- docs/conf.py | 2 +- docs/monitor.rst | 1 + setup.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/django_q/__init__.py b/django_q/__init__.py index 4cb49b5..acadefb 100644 --- a/django_q/__init__.py +++ b/django_q/__init__.py @@ -9,6 +9,6 @@ from .models import Task, Schedule, Success, Failure from .cluster import Cluster from .monitor import Stat -VERSION = (0, 4, 3) +VERSION = (0, 4, 4) default_app_config = 'django_q.apps.DjangoQConfig' diff --git a/docs/conf.py b/docs/conf.py index 30d2441..b614871 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -72,7 +72,7 @@ author = 'Ilan Steemers' # The short X.Y version. version = '0.4' # The full version, including alpha/beta/rc tags. -release = '0.4.3' +release = '0.4.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/monitor.rst b/docs/monitor.rst index 63a0a03..6aa8343 100644 --- a/docs/monitor.rst +++ b/docs/monitor.rst @@ -118,6 +118,7 @@ Reference .. py:attribute:: task_q_size The number of tasks currently in the task queue. + Turns green to indicate that the :ref:`queue_limit` had been reached. .. py:attribute:: done_q_size diff --git a/setup.py b/setup.py index d7176cd..ee49b19 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ class PyTest(Command): setup( name='django-q', - version='0.4.3', + version='0.4.4', author='Ilan Steemers', author_email='koed00@gmail.com', keywords='django task queue worker redis multiprocessing', From 964d01c7c6e8decb108f5019945c523eba4e2dfe Mon Sep 17 00:00:00 2001 From: Ilan Date: Mon, 27 Jul 2015 19:25:16 +0200 Subject: [PATCH 2/6] Updated monitor readme --- docs/monitor.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/monitor.rst b/docs/monitor.rst index 6aa8343..8da64a1 100644 --- a/docs/monitor.rst +++ b/docs/monitor.rst @@ -46,7 +46,8 @@ TQ **Task Queue** counts the number of tasks in the queue If this keeps rising it means you are taking on more tasks than your cluster can handle. -You can limit this by settings the :ref:`queue_limit` in your cluster configuration. +You can limit this by settings the :ref:`queue_limit` in your cluster configuration, after which it will turn green when that limit has been reached. +If your task queue is always hitting its limit and your running out of resources, it may be time to add another cluster. RQ ~~ @@ -118,7 +119,6 @@ Reference .. py:attribute:: task_q_size The number of tasks currently in the task queue. - Turns green to indicate that the :ref:`queue_limit` had been reached. .. py:attribute:: done_q_size @@ -151,4 +151,3 @@ Reference .. py:classmethod:: get_all(r=redis_client) Returns a list of :class:`Stat` objects for all active clusters. Takes an optional redis connection. - From 5dee020d7b57e5e6ff1b6fb70176c267a3201f4b Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Sat, 1 Aug 2015 00:52:24 +0200 Subject: [PATCH 3/6] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 4ab5911..9bac1e2 100644 --- a/README.rst +++ b/README.rst @@ -20,7 +20,7 @@ Features - Django Admin integration - PaaS compatible with multiple instances - Multi cluster monitor -- Redis +- Redis broker - Python 2 and 3 Requirements From fc2c4329e3910d68b4a0bf81647692ffff9c177f Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Sat, 1 Aug 2015 00:53:07 +0200 Subject: [PATCH 4/6] Update index.rst --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 6cc3d28..edd6f27 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -20,7 +20,7 @@ Features - Django Admin integration - PaaS compatible with multiple instances - Multi cluster monitor -- Redis +- Redis broker - Python 2 and 3 From b50e2a9006cc89f9edb6c055356aa39bba0bfadc Mon Sep 17 00:00:00 2001 From: Ilan Date: Sat, 1 Aug 2015 15:55:21 +0200 Subject: [PATCH 5/6] ready for 0.4.5 --- django_q/__init__.py | 2 +- docs/conf.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django_q/__init__.py b/django_q/__init__.py index acadefb..9b84414 100644 --- a/django_q/__init__.py +++ b/django_q/__init__.py @@ -9,6 +9,6 @@ from .models import Task, Schedule, Success, Failure from .cluster import Cluster from .monitor import Stat -VERSION = (0, 4, 4) +VERSION = (0, 4, 5) default_app_config = 'django_q.apps.DjangoQConfig' diff --git a/docs/conf.py b/docs/conf.py index b614871..fe87e52 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -72,7 +72,7 @@ author = 'Ilan Steemers' # The short X.Y version. version = '0.4' # The full version, including alpha/beta/rc tags. -release = '0.4.4' +release = '0.4.5' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index ee49b19..b8490ea 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ class PyTest(Command): setup( name='django-q', - version='0.4.4', + version='0.4.5', author='Ilan Steemers', author_email='koed00@gmail.com', keywords='django task queue worker redis multiprocessing', From db1906030e3499981cde5a196ef0badf799e1f0c Mon Sep 17 00:00:00 2001 From: Ilan Date: Sat, 1 Aug 2015 22:24:18 +0200 Subject: [PATCH 6/6] removed python 2.6 --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index b8490ea..c006c17 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,6 @@ setup( 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3',