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

Fix build code:

Browse source 
- Fix issue with the queue_item in extend processing
  - Add the new compiled docker binary with the lxc volume fix
This commit is contained in:
Joseph Schorr 2014-12-04 17:49:39 +01:00
parent c8277b07d9
commit dbac8c7e3d
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
binary_dependencies/builder/lxc-docker-1.3.2-userns_1.3.2-userns-20141124223407-72690d2-dirty_amd64.deb
View file

Binary file not shown.

3
data/queue.py
View file

@ -128,8 +128,9 @@ class WorkQueue(object):
self._currently_processing = False self._currently_processing = False
@staticmethod @staticmethod
def extend_processing(queue_item, seconds_from_now, retry_count=None, def extend_processing(queue_item_info, seconds_from_now, retry_count=None,
minimum_extension=MINIMUM_EXTENSION): minimum_extension=MINIMUM_EXTENSION):
queue_item = QueueItem.get(QueueItem.id == queue_item_info.id)
new_expiration = datetime.utcnow() + timedelta(seconds=seconds_from_now) new_expiration = datetime.utcnow() + timedelta(seconds=seconds_from_now)
# Only actually write the new expiration to the db if it moves the expiration some minimum # Only actually write the new expiration to the db if it moves the expiration some minimum

3
workers/worker.py
View file

@ -11,6 +11,7 @@ from threading import Thread
from time import sleep from time import sleep
from data.model import db from data.model import db
from data.queue import WorkQueue
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -97,7 +98,7 @@ class Worker(object):
def extend_processing(self, seconds_from_now): def extend_processing(self, seconds_from_now):
with self._current_item_lock: with self._current_item_lock:
if self.current_queue_item is not None: if self.current_queue_item is not None:
self._queue.extend_processing(self.current_queue_item, seconds_from_now) WorkQueue.extend_processing(self.current_queue_item, seconds_from_now)
def run_watchdog(self): def run_watchdog(self):
logger.debug('Running watchdog.') logger.debug('Running watchdog.')