From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 1 Nov 2017 14:35:32 +0000 (+0000)
Subject: hub: End queue connection when client wants to
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59afa7bf522be9cc23bc6ba8d1f8aacb2d6768ac;p=pbs.git

hub: End queue connection when client wants to

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/hub/handlers.py b/src/hub/handlers.py
index 8b922242..a4bd8164 100644
--- a/src/hub/handlers.py
+++ b/src/hub/handlers.py
@@ -521,7 +521,7 @@ class BuildersJobsQueueHandler(BuildersBaseHandler):
 
 			# Got no job, wait and try again.
 			if not job:
-				return self.add_timeout(10, self.callback)
+				return self.add_timeout(self.heartbeat, self.callback)
 
 			# We got a job!
 			job.start(builder=self.builder)
@@ -538,6 +538,18 @@ class BuildersJobsQueueHandler(BuildersBaseHandler):
 			# Send build information to the builder.
 			self.finish(ret)
 
+	@property
+	def heartbeat(self):
+		return 15 # 15 seconds
+
+	@property
+	def max_runtime(self):
+		timeout = self.get_argument_int("timeout", None)
+		if timeout:
+			return timeout - self.heartbeat
+
+		return 300 # 5 min
+
 
 class BuildersJobsStateHandler(BuildersBaseHandler):
 	@tornado.web.authenticated