From 49685b6bef2ac846efa29fd51d76731950696961 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sun, 7 Jun 2020 18:33:31 +0300 Subject: [PATCH] collectd: sqm_collect: tidy interval string handling Signed-off-by: Kevin Darbyshire-Bryant (cherry picked from commit c2c91ea99e5fb7d4798116888b31f8fd9117d8ee) --- utils/collectd/Makefile | 2 +- utils/collectd/files/exec-scripts/sqm_collectd.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 20e635ea96..7e0eb9f06f 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.11.0 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://collectd.org/files/ \ diff --git a/utils/collectd/files/exec-scripts/sqm_collectd.sh b/utils/collectd/files/exec-scripts/sqm_collectd.sh index f158056e8f..ad84fc762a 100755 --- a/utils/collectd/files/exec-scripts/sqm_collectd.sh +++ b/utils/collectd/files/exec-scripts/sqm_collectd.sh @@ -3,7 +3,7 @@ . /usr/share/libubox/jshn.sh HOSTNAME="${COLLECTD_HOSTNAME:-localhost}" -INTERVAL="${COLLECTD_INTERVAL:-60.000}" +INTERVAL="${COLLECTD_INTERVAL:-60}" handle_cake() { local ifc ifr tin i @@ -79,8 +79,7 @@ process_qdisc() { local ifc jsn ifc="$1" - jsn=$(tc -s -j qdisc show dev "$ifc") - [ $? ] || return + jsn=$(tc -s -j qdisc show dev "$ifc") || return # strip leading & trailing [] jsn="${jsn#[}" ; jsn="${jsn%]}" @@ -104,5 +103,5 @@ while true ; do for ifc in "$@" ; do process_qdisc "$ifc" done - sleep "${INTERVAL%.000}" + sleep "${INTERVAL%%.*}" done -- 2.30.2