aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2017-08-29 14:18:55 +0100
committerPascal Terjan <pterjan@mageia.org>2017-08-29 14:20:29 +0100
commitd05adca49a05c3128e102a5fc0ff7dfd313b7863 (patch)
treeb85d9400a2b6c3eb3746140af731d21350542446
parentb22e8cc9bc28507278b18bf85a9af70c42b44f60 (diff)
downloadiurt-d05adca49a05c3128e102a5fc0ff7dfd313b7863.tar
iurt-d05adca49a05c3128e102a5fc0ff7dfd313b7863.tar.gz
iurt-d05adca49a05c3128e102a5fc0ff7dfd313b7863.tar.bz2
iurt-d05adca49a05c3128e102a5fc0ff7dfd313b7863.tar.xz
iurt-d05adca49a05c3128e102a5fc0ff7dfd313b7863.zip
Fix killing the build when log file is not created within 30s
-rw-r--r--NEWS1
-rw-r--r--lib/Iurt/Process.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 50a487f..63d325f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- ulri: improve handling of build failures
+- iurt: fix stale command detection when log is not created quickly enough
0.6.29
- iurt: support chroot tarballs with non gz compression
diff --git a/lib/Iurt/Process.pm b/lib/Iurt/Process.pm
index 9dfd1ad..52b0b79 100644
--- a/lib/Iurt/Process.pm
+++ b/lib/Iurt/Process.pm
@@ -106,7 +106,7 @@ sub fork_to_monitor {
kill 14, "-$parent_pid";
exit();
}
- if ($stat[9] + $opt{stalled_timeout} < time()) {
+ if ($stat[9] && $stat[9] + $opt{stalled_timeout} < time()) {
# If nothing was written to the logfile for more than stalled_timeout, check if the system seems busy
if ((getload())[1] < 0.5) {
plog('ERROR', "Killing current command because it seems blocked");