fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-10 01:30:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	docs/monitor.rst
This commit is contained in:
Ilan
2015-08-04 15:15:45 +02:00
parent 3ca7978d8c db1906030e
commit 25dcec4572
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.rst
+1 -1
View File
@@ -20,7 +20,7 @@ Features
- Django Admin integration - Django Admin integration
- PaaS compatible with multiple instances - PaaS compatible with multiple instances
- Multi cluster monitor - Multi cluster monitor
- Redis - Redis broker
- Python 2 and 3 - Python 2 and 3
Requirements Requirements
django_q/__init__.py
+1 -1
View File
@@ -9,6 +9,6 @@ from .models import Task, Schedule, Success, Failure
from .cluster import Cluster from .cluster import Cluster
from .monitor import Stat from .monitor import Stat
VERSION = (0, 4, 3) VERSION = (0, 4, 5)
default_app_config = 'django_q.apps.DjangoQConfig' default_app_config = 'django_q.apps.DjangoQConfig'
docs/conf.py
+1 -1
View File
@@ -72,7 +72,7 @@ author = 'Ilan Steemers'
# The short X.Y version. # The short X.Y version.
version = '0.4' version = '0.4'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.4.3' release = '0.4.5'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
docs/index.rst
+1 -1
View File
@@ -20,7 +20,7 @@ Features
- Django Admin integration - Django Admin integration
- PaaS compatible with multiple instances - PaaS compatible with multiple instances
- Multi cluster monitor - Multi cluster monitor
- Redis - Redis broker
- Python 2 and 3 - Python 2 and 3
docs/monitor.rst
+2 -2
View File
@@ -46,7 +46,8 @@ TQ
**Task Queue** counts the number of tasks in the queue [#f1]_ **Task Queue** counts the number of tasks in the queue [#f1]_
If this keeps rising it means you are taking on more tasks than your cluster can handle. 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 RQ
~~ ~~
@@ -143,7 +144,6 @@ Reference
Returns true or false depending on any tasks still present in the task or result queue. Returns true or false depending on any tasks still present in the task or result queue.
.. py:classmethod:: get(cluster_id, r=redis_client) .. py:classmethod:: get(cluster_id, r=redis_client)
Gets the current :class:`Stat` for the cluster id. Takes an optional redis connection. Gets the current :class:`Stat` for the cluster id. Takes an optional redis connection.
setup.py
+1 -2
View File
@@ -26,7 +26,7 @@ class PyTest(Command):
setup( setup(
name='django-q', name='django-q',
version='0.4.3', version='0.4.5',
author='Ilan Steemers', author='Ilan Steemers',
author_email='koed00@gmail.com', author_email='koed00@gmail.com',
keywords='django task queue worker redis multiprocessing', keywords='django task queue worker redis multiprocessing',
@@ -48,7 +48,6 @@ setup(
'Operating System :: OS Independent', 'Operating System :: OS Independent',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.3',