From 52108a8b74c488be85809d8b29a66596f5241e03 Mon Sep 17 00:00:00 2001 From: Zachary Vance Date: Tue, 20 Jun 2017 14:07:49 -0700 Subject: [PATCH] Try to parse time in status.cgi --- cgi-bin/status-simple | 4 +++- cgi-bin/status.cgi | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cgi-bin/status-simple b/cgi-bin/status-simple index 9b1cc2d..3ac83d6 100755 --- a/cgi-bin/status-simple +++ b/cgi-bin/status-simple @@ -1,6 +1,8 @@ #!/bin/bash TEMP=$(mktemp) -timeout 5 bash "$@" >"$TEMP" 2>/dev/null +SECONDS=5 +if [ $# -eq 1 ]; then SECONDS="$1"; shift; fi +timeout "${SECONDS}" bash "$@" >"$TEMP" 2>/dev/null SUCCESS=$? if [ "$SUCCESS" -eq 0 ]; then diff --git a/cgi-bin/status.cgi b/cgi-bin/status.cgi index 62b9fed..22c3438 100755 --- a/cgi-bin/status.cgi +++ b/cgi-bin/status.cgi @@ -4,6 +4,12 @@ echo STATUS="$(basename "$PATH_TRANSLATED")" FOLDER="/var/www/za3k/cgi-bin/${STATUS}.d" +SECONDS=5 +if [[ "${QUERY_STRING}" =~ ^t=[0-9]+$ ]] +then + SECONDS="${QUERY_STRING#t=}" +fi +export SECONDS echo "" echo "" @@ -17,7 +23,7 @@ echo " Service" echo " Status" echo " Details" echo " " -find "${FOLDER}" -type f -print0 | sort -z | SHELL=/bin/sh parallel -0 -j 0 --keep-order -n1 -- ./status-simple +find "${FOLDER}" -type f -print0 | sort -z | SHELL=/bin/sh parallel -0 -j 0 --keep-order -n1 -- ./status-simple "${SECONDS}" echo "" echo "[Source]" echo "" -- 2.47.3