diff options
| author | Fredrik Aslund <fredrik.aslund@umu.se> | 2016-11-04 12:12:46 +0100 |
|---|---|---|
| committer | Fredrik Aslund <fredrik.aslund@umu.se> | 2016-11-04 12:12:46 +0100 |
| commit | 0981e9da175b4deaf669bb193be97edd75b88bbc (patch) | |
| tree | 9aa5871a22eb9174415261d8c5c50475aa39e15f /scripts/aggregate.sh | |
| parent | 369096085d36f3082527f7aec3ba5411a610cfa7 (diff) | |
do not use timeout command
Diffstat (limited to 'scripts/aggregate.sh')
| -rwxr-xr-x | scripts/aggregate.sh | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/scripts/aggregate.sh b/scripts/aggregate.sh index fa108398..3d2c47e4 100755 --- a/scripts/aggregate.sh +++ b/scripts/aggregate.sh @@ -1,7 +1,6 @@ #!/bin/sh aggregate_interval_min=60 -cmd_timeout_s=600 DIR=`pwd` ODIR=$1 @@ -22,18 +21,5 @@ grep -v -e '^#' $ODIR/metadata.lst | (while read url cert; do cfile=$DIR/certs/$cert fi cmd="$DIR/scripts/pull-and-verify.sh $url $ODIR $cfile" - timeout $cmd_timeout_s $cmd 2>&1 - ret=$? - case $ret in - 0) - ;; - 124) - echo "$cmd timed out after $cmd_timeout_s seconds" - exit $ret - ;; - *) - echo "$cmd failed with exit code $ret, output:" - exit $ret - ;; - esac + $cmd || { echo "$cmd returned $ret" ; exit $ret ; } done) || exit $ret |