aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2020-12-04 12:48:39 +0000
committerPascal Terjan <pterjan@mageia.org>2020-12-04 12:48:39 +0000
commitbd4de509f77c7a9f7a5ecf92f74582e8ee42eb70 (patch)
tree2e1afb89f970c48762b257d6ca1d39362f23c89a
parent9668972049dd1f77da3afc33debdf8ed99168c69 (diff)
downloadiurt-bd4de509f77c7a9f7a5ecf92f74582e8ee42eb70.tar
iurt-bd4de509f77c7a9f7a5ecf92f74582e8ee42eb70.tar.gz
iurt-bd4de509f77c7a9f7a5ecf92f74582e8ee42eb70.tar.bz2
iurt-bd4de509f77c7a9f7a5ecf92f74582e8ee42eb70.tar.xz
iurt-bd4de509f77c7a9f7a5ecf92f74582e8ee42eb70.zip
Change misleading log lines
-rw-r--r--lib/Iurt/Process.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Iurt/Process.pm b/lib/Iurt/Process.pm
index dc25f99..2d1c060 100644
--- a/lib/Iurt/Process.pm
+++ b/lib/Iurt/Process.pm
@@ -184,7 +184,7 @@ sub handle_wait_regexp {
sub generate_comment {
my ($run, $config, $output, $command, $comment, $pipe, $kill, %opt) = @_;
if ($kill && $opt{type} ne 'shell') {
- $comment = "Command killed after $opt{timeout}s: $command\n";
+ $comment = "Command killed: $command\n";
my ($cmd_to_kill) = $command =~ /sudo(?: chroot \S+)? (.*)/;
clean_process($cmd_to_kill);
} elsif ($pipe) {
@@ -254,7 +254,7 @@ sub perform_command {
eval {
# handle timeout:
local $SIG{ALRM} = sub {
- print "Timeout! (timeout was $opt{timeout})\n";
+ print "Killed! (probably because of the $opt{timeout} timeout)\n";
$kill = 1;
die "alarm\n"; # NB: \n required
};