summaryrefslogtreecommitdiffstats
path: root/collectors/charts.d.plugin/charts.d.plugin.in
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-05-21 18:55:22 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-05-21 18:55:22 +0000
commit61d0027904ee9c040985b1642ca228737d616d03 (patch)
treec90838c137b4dc4a2de1cff9f2d7be5552d605e7 /collectors/charts.d.plugin/charts.d.plugin.in
parentAdding upstream version 1.14.0. (diff)
downloadnetdata-61d0027904ee9c040985b1642ca228737d616d03.tar.xz
netdata-61d0027904ee9c040985b1642ca228737d616d03.zip
Adding upstream version 1.15.0.upstream/1.15.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'collectors/charts.d.plugin/charts.d.plugin.in')
-rwxr-xr-xcollectors/charts.d.plugin/charts.d.plugin.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in
index 05a63875b..a3f0aa954 100755
--- a/collectors/charts.d.plugin/charts.d.plugin.in
+++ b/collectors/charts.d.plugin/charts.d.plugin.in
@@ -281,7 +281,14 @@ run() {
if [ "z${1}" = "z-t" -a "${2}" != "0" ]; then
t="${2}"
shift 2
- timeout ${t} "${@}" 2>"${TMP_DIR}/run.${pid}"
+ case "${NETDATA_SYSTEM_OS_ID}" in
+ "alpine")
+ timeout -t ${t} "${@}" 2>"${TMP_DIR}/run.${pid}"
+ ;;
+ *)
+ timeout ${t} "${@}" 2>"${TMP_DIR}/run.${pid}"
+ ;;
+ esac
ret=$?
else
"${@}" 2>"${TMP_DIR}/run.${pid}"