Merge branch 'build-36h' into 'master'

[fdroidserver.git] / fdroidserver / build.py

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 0b575847199b8db928b1fcdcbe534f34d1693f88..41fb2251399dcf304e2676b7c8cf6d551c4a8550 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -1082,8 +1082,8 @@ def main():
     # Build applications...
     failed_apps = {}
     build_succeeded = []
-    # Only build for 12 hours, then stop gracefully
-    endtime = time.time() + 12 * 60 * 60
+    # Only build for 36 hours, then stop gracefully.
+    endtime = time.time() + 36 * 60 * 60
     max_build_time_reached = False
     for appid, app in apps.items():
 
@@ -1102,6 +1102,7 @@ def main():
             if options.server and timeout > 0:
                 logging.debug(_('Setting {0} sec timeout for this build').format(timeout))
                 timer = threading.Timer(timeout, force_halt_build, [timeout])
+                timeout_event.clear()
                 timer.start()
             else:
                 timer = None