Adds a MongoDB broker

* adds mongo broker tests
* adds mongo brokers docs

* broker info is now cached when it needs to connect to a server, to reduce traffic.
This commit is contained in:
Ilan Steemers
2015-09-25 20:03:39 +02:00
parent ef6a60478a
commit 826178c463
11 changed files with 188 additions and 11 deletions
+5 -1
View File
@@ -7,6 +7,7 @@ class Broker(object):
self.connection = self.get_connection(list_key)
self.list_key = list_key
self.cache = self.get_cache()
self._info = None
def enqueue(self, task):
"""
@@ -78,7 +79,7 @@ class Broker(object):
"""
Shows the broker type
"""
pass
return self._info
def set_stat(self, key, value, timeout):
"""
@@ -167,6 +168,9 @@ def get_broker(list_key=Conf.PREFIX):
elif Conf.ORM:
from brokers import orm
return orm.ORM(list_key=list_key)
elif Conf.MONGO:
from brokers import mongo
return mongo.Mongo(list_key=list_key)
# default to redis
else:
from brokers import redis_broker
+4 -2
View File
@@ -40,8 +40,10 @@ class Disque(Broker):
return len(jobs)
def info(self):
info = self.connection.info('server')
return 'Disque {}'.format(info['disque_version'])
if not self._info:
info = self.connection.info('server')
self._info= 'Disque {}'.format(info['disque_version'])
return self._info
@staticmethod
def get_connection(list_key=Conf.PREFIX):
+64
View File
@@ -0,0 +1,64 @@
from datetime import timedelta
from time import sleep
from bson import ObjectId
from django.utils import timezone
from pymongo import MongoClient
from django_q.brokers import Broker
from django_q.conf import Conf
def _timeout():
return timezone.now() - timedelta(seconds=Conf.RETRY)
class Mongo(Broker):
def __init__(self, list_key=Conf.PREFIX):
super(Mongo, self).__init__(list_key)
self.collection = self.connection[Conf.MONGO_DB][list_key]
@staticmethod
def get_connection(list_key=Conf.PREFIX):
return MongoClient(**Conf.MONGO)
def queue_size(self):
return self.collection.count({'lock': {'$lte': _timeout()}})
def lock_size(self):
return self.collection.count({'lock': {'$gt': _timeout()}})
def purge_queue(self):
return self.delete_queue()
def ping(self):
return self.info is not None
def info(self):
if not self._info:
self._info = 'MongoDB {}'.format(self.connection.server_info()['version'])
return self._info
def fail(self, task_id):
self.delete(task_id)
def enqueue(self, task):
inserted_id = self.collection.insert_one({'payload': task, 'lock': _timeout()}).inserted_id
return str(inserted_id)
def dequeue(self):
task = self.collection.find_one_and_update({'lock': {'$lte': _timeout()}}, {'$set': {'lock': timezone.now()}})
if task:
return [(str(task['_id']), task['payload'])]
# empty queue, spare the cpu
sleep(0.2)
def delete_queue(self):
return self.collection.drop()
def delete(self, task_id):
self.collection.delete_one({'_id': ObjectId(task_id)})
def acknowledge(self, task_id):
return self.delete(task_id)
+4 -2
View File
@@ -21,7 +21,7 @@ class ORM(Broker):
return self.connection.filter(key=self.list_key, lock__lte=_timeout()).count()
def lock_size(self):
return self.connection.filter(key=self.list_key, lock__gte=_timeout()).count()
return self.connection.filter(key=self.list_key, lock__gt=_timeout()).count()
def purge_queue(self):
return self.connection.filter(key=self.list_key).delete()
@@ -30,7 +30,9 @@ class ORM(Broker):
return True
def info(self):
return 'ORM {}'.format(Conf.ORM)
if not self._info:
self._info = 'ORM {}'.format(Conf.ORM)
return self._info
def fail(self, task_id):
self.delete(task_id)
+5 -3
View File
@@ -1,4 +1,5 @@
import redis
from django_q.brokers import Broker
from django_q.conf import Conf, logger
@@ -9,7 +10,6 @@ except ImportError:
class Redis(Broker):
def __init__(self, list_key=Conf.PREFIX):
super(Redis, self).__init__(list_key='django_q:{}:q'.format(list_key))
@@ -38,8 +38,10 @@ class Redis(Broker):
raise e
def info(self):
info = self.connection.info('server')
return 'Redis {}'.format(info['redis_version'])
if not self._info:
info = self.connection.info('server')
self._info = 'Redis {}'.format(info['redis_version'])
return self._info
def set_stat(self, key, value, timeout):
self.connection.set(key, value, timeout)