Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit ab144a6388bca952d247d20fdef89fecf0b6f845
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jan 26 11:40:01 2016 +0100
[backend] jobgrabcontrol.py/retask misuse fix
This complements 59c6e38005456d22f079c3dd5 commit.
---------------------------------------------------------------
backend/backend/jobgrabcontrol.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/backend/backend/jobgrabcontrol.py b/backend/backend/jobgrabcontrol.py
index c8d7414..4ff2ca9 100644
--- a/backend/backend/jobgrabcontrol.py
+++ b/backend/backend/jobgrabcontrol.py
@@ -19,7 +19,7 @@ class Channel(object):
# channel for JobGrabber <--> [[Builders]] communication
self.build_queues = dict()
while not self.jg_start.connect():
- wait_log("waiting for redis", 5)
+ wait_log(self.log, "waiting for redis", 5)
def _get_queue(self, bgroup):
if not bgroup in self.build_queues:
@@ -75,6 +75,8 @@ class Channel(object):
# Backend's API
def backend_start(self):
""" Notify jobgrab about service start. """
- self.jg_start.enqueue("start")
+ if not self.jg_start.enqueue(Task("start")):
+ raise Exception("can't append to retask queue, should never
happen!")
+
while self.jg_start.length:
wait_log(self.log, "waiting until jobgrabber initializes queue")