X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fbin%2Fbomb.pl;h=5671a53d0d65e5ef9b37a9d7f9305a096d7263fb;hb=87d282b5e8d01e9b38aed892cd8d021d3de84327;hp=a84f40bb82bdc178167e11046f485d5718f137aa;hpb=bd230d3ba29021292ab66acd507242f66e04c904;p=mkws-moved-to-github.git diff --git a/test/bin/bomb.pl b/test/bin/bomb.pl index a84f40b..5671a53 100755 --- a/test/bin/bomb.pl +++ b/test/bin/bomb.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # Copyright (c) 2014 IndexData ApS. http://indexdata.com # # bomb.pl - wrapper to stop a process after N seconds @@ -28,17 +28,16 @@ sub set_alarm { warn "Time out alarm $time\n"; # sends a hang-up signal to all processes in the current process group - # and kill running java processes local $SIG{HUP} = "IGNORE"; kill 1, -$$; + sleep 0.2; local $SIG{TERM} = "IGNORE"; kill 15, -$$; + sleep 0.2; kill 15, -$$; warn "Send a hang-up to all childs.\n"; - - #exit 1; }; warn "set alarm time to: $time seconds $message\n" if $debug >= 1; @@ -57,7 +56,7 @@ EOF GetOptions( "help" => \$help, "debug=i" => \$debug, - "timeout=i" => \$timeout, + "timeout=f" => \$timeout, ) or die usage; my @system = @ARGV; @@ -68,6 +67,6 @@ die usage if !@system; set_alarm( $timeout, join( " ", @system ) ); system(@system) == 0 - or die "system @system failed: $?"; + or die "@system failed with exit code: $?\n"; exit(0);