vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

data.queue: move name matching clause

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-05-31 15:44:11 -04:00
parent 26300d3c8e
commit 1f488acf12
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
data/queue.py
View file

@ -52,12 +52,13 @@ class WorkQueue(object):
@classmethod @classmethod
def _available_jobs(cls, now, name_match_query): def _available_jobs(cls, now, name_match_query):
return cls._available_jobs_where(QueueItem.select(), now, name_match_query) return (cls
._available_jobs_where(QueueItem.select(), now)
.where(QueueItem.queue_name ** name_match_query))
@staticmethod @staticmethod
def _available_jobs_where(query, now, name_match_query): def _available_jobs_where(query, now):
return query.where(QueueItem.queue_name ** name_match_query, return query.where(QueueItem.available_after <= now,
QueueItem.available_after <= now,
((QueueItem.available == True) | (QueueItem.processing_expires <= now)), ((QueueItem.available == True) | (QueueItem.processing_expires <= now)),
QueueItem.retries_remaining > 0) QueueItem.retries_remaining > 0)
@ -176,7 +177,7 @@ class WorkQueue(object):
processing_expires=now + timedelta(seconds=processing_time), processing_expires=now + timedelta(seconds=processing_time),
retries_remaining=QueueItem.retries_remaining-1) retries_remaining=QueueItem.retries_remaining-1)
.where(QueueItem.id == db_item.id)) .where(QueueItem.id == db_item.id))
changed_query = self._available_jobs_where(set_unavailable_query, now, name_match_query) changed_query = self._available_jobs_where(set_unavailable_query, now)
changed = changed_query.execute() changed = changed_query.execute()
if changed == 1: if changed == 1:
item = AttrDict({ item = AttrDict({