Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit bee5867e8ad679f001386c566f35a4bda2170ca2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Dec 9 22:38:56 2013 +0100
handle default timeout on backend
set default timeout on fronted to 0
and then if backend will get 0 use value from config or backend default
---------------------------------------------------------------
backend/dispatcher.py | 5 ++++-
coprs_frontend/coprs/constants.py | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/backend/dispatcher.py b/backend/dispatcher.py
index 5e1e496..83053d1 100644
--- a/backend/dispatcher.py
+++ b/backend/dispatcher.py
@@ -216,7 +216,10 @@ class Worker(multiprocessing.Process):
jobdata.chroot = build['chroot']
jobdata.buildroot_pkgs = build['buildroot_pkgs']
jobdata.memory_reqs = build['memory_reqs']
- jobdata.timeout = build['timeout']
+ if build['timeout']:
+ jobdata.timeout = build['timeout']
+ else:
+ jobdata.timeout = self.opts.timeout
jobdata.destdir = os.path.normpath(self.opts.destdir + '/' +
build['copr']['owner']['name'] + '/' +
build['copr']['name'])
jobdata.build_id = build['id']
jobdata.results = self.opts.results_baseurl + '/' +
build['copr']['owner']['name'] + '/' +
build['copr']['name'] + '/'
diff --git a/coprs_frontend/coprs/constants.py b/coprs_frontend/coprs/constants.py
index 04b7079..afadbcf 100644
--- a/coprs_frontend/coprs/constants.py
+++ b/coprs_frontend/coprs/constants.py
@@ -22,6 +22,6 @@ DEFAULT_BUILD_MEMORY = 2048
MIN_BUILD_MEMORY = 2048
MAX_BUILD_MEMORY = 4096
## in seconds
-DEFAULT_BUILD_TIMEOUT = 1800
+DEFAULT_BUILD_TIMEOUT = 0
MIN_BUILD_TIMEOUT = 180
MAX_BUILD_TIMEOUT = 36000