diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-05-21 18:56:05 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-05-21 18:56:05 +0000 |
| commit | 54deae27eed83a162ee438ef6bad4a23767757dd (patch) | |
| tree | da5333377dfacf22177375aef822a8e696f007eb /collectors/charts.d.plugin/charts.d.plugin.in | |
| parent | Releasing debian version 1.14.0-1. (diff) | |
| download | netdata-54deae27eed83a162ee438ef6bad4a23767757dd.tar.xz netdata-54deae27eed83a162ee438ef6bad4a23767757dd.zip | |
Merging upstream version 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-x | collectors/charts.d.plugin/charts.d.plugin.in | 9 |
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}" |