mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 06:52:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: log timeouts to the wiki

Browse source
This commit is contained in:
Marcus Hoffmann 2018-01-20 22:16:39 +01:00
parent 85985074d4
commit 80e121d182
No known key found for this signature in database
GPG key ID: ACDF63BC43D5E530
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
fdroidserver/build.py
View file

@ -240,9 +240,12 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
logging.info("...getting exit status") logging.info("...getting exit status")
returncode = chan.recv_exit_status() returncode = chan.recv_exit_status()
if returncode != 0: if returncode != 0:
raise BuildException( if timeout_event.is_set():
"Build.py failed on server for {0}:{1}".format( message = "Timeout exceeded! Build VM force-stopped for {0}:{1}"
app.id, build.versionName), None if options.verbose else str(output, 'utf-8')) else:
message = "Build.py failed on server for {0}:{1}"
raise BuildException(message.format(app.id, build.versionName),
None if options.verbose else str(output, 'utf-8'))
# Retreive logs... # Retreive logs...
toolsversion_log = common.get_toolsversion_logname(app, build) toolsversion_log = common.get_toolsversion_logname(app, build)
@ -982,6 +985,7 @@ def trybuild(app, build, build_dir, output_dir, log_dir, also_check_dir,
def force_halt_build(): def force_halt_build():
"""Halt the currently running Vagrant VM, to be called from a Timer""" """Halt the currently running Vagrant VM, to be called from a Timer"""
logging.error(_('Force halting build after timeout!')) logging.error(_('Force halting build after timeout!'))
timeout_event.set()
vm = vmtools.get_build_vm('builder') vm = vmtools.get_build_vm('builder')
vm.halt() vm.halt()
@ -1037,6 +1041,7 @@ config = None
buildserverid = None buildserverid = None
fdroidserverid = None fdroidserverid = None
start_timestamp = time.gmtime() start_timestamp = time.gmtime()
timeout_event = threading.Event()
def main(): def main():