Replaces format with f-strings

This commit is contained in:
Ilan
2020-02-18 18:47:05 +01:00
parent dcc115ca1b
commit 7c31c2408c
6 changed files with 87 additions and 58 deletions
+20 -7
View File
@@ -27,10 +27,16 @@ class ORM(Broker):
return OrmQ.objects.using(Conf.ORM)
def queue_size(self):
return self.get_connection().filter(key=self.list_key, lock__lte=_timeout()).count()
return (
self.get_connection()
.filter(key=self.list_key, lock__lte=_timeout())
.count()
)
def lock_size(self):
return self.get_connection().filter(key=self.list_key, lock__gt=_timeout()).count()
return (
self.get_connection().filter(key=self.list_key, lock__gt=_timeout()).count()
)
def purge_queue(self):
return self.get_connection().filter(key=self.list_key).delete()
@@ -40,22 +46,30 @@ class ORM(Broker):
def info(self):
if not self._info:
self._info = 'ORM {}'.format(Conf.ORM)
self._info = f"ORM {Conf.ORM}"
return self._info
def fail(self, task_id):
self.delete(task_id)
def enqueue(self, task):
package = self.get_connection().create(key=self.list_key, payload=task, lock=_timeout())
package = self.get_connection().create(
key=self.list_key, payload=task, lock=_timeout()
)
return package.pk
def dequeue(self):
tasks = self.get_connection().filter(key=self.list_key, lock__lt=_timeout())[0:Conf.BULK]
tasks = self.get_connection().filter(key=self.list_key, lock__lt=_timeout())[
0 : Conf.BULK
]
if tasks:
task_list = []
for task in tasks:
if self.get_connection().filter(id=task.id, lock=task.lock).update(lock=timezone.now()):
if (
self.get_connection()
.filter(id=task.id, lock=task.lock)
.update(lock=timezone.now())
):
task_list.append((task.pk, task.payload))
# else don't process, as another cluster has been faster than us on that task
return task_list
@@ -70,4 +84,3 @@ class ORM(Broker):
def acknowledge(self, task_id):
return self.delete(task_id)