Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

collectd: sqm_collect: tidy interval string handling

Browse source 
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant 2020-05-25 15:30:34 +01:00 committed by Kevin Darbyshire-Bryant
parent 6d739af17c
commit c2c91ea99e
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/collectd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=collectd PKG_NAME:=collectd
PKG_VERSION:=5.11.0 PKG_VERSION:=5.11.0
PKG_RELEASE:=6 PKG_RELEASE:=7
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://collectd.org/files/ \ PKG_SOURCE_URL:=https://collectd.org/files/ \

7
utils/collectd/files/exec-scripts/sqm_collectd.sh
View file

@ -3,7 +3,7 @@
. /usr/share/libubox/jshn.sh . /usr/share/libubox/jshn.sh
HOSTNAME="${COLLECTD_HOSTNAME:-localhost}" HOSTNAME="${COLLECTD_HOSTNAME:-localhost}"
INTERVAL="${COLLECTD_INTERVAL:-60.000}" INTERVAL="${COLLECTD_INTERVAL:-60}"
handle_cake() { handle_cake() {
local ifc ifr tin i local ifc ifr tin i
@ -79,8 +79,7 @@ process_qdisc() {
local ifc jsn local ifc jsn
ifc="$1" ifc="$1"
jsn=$(tc -s -j qdisc show dev "$ifc") jsn=$(tc -s -j qdisc show dev "$ifc") || return
[ $? ] || return
# strip leading & trailing [] # strip leading & trailing []
jsn="${jsn#[}" ; jsn="${jsn%]}" jsn="${jsn#[}" ; jsn="${jsn%]}"
@ -104,5 +103,5 @@ while true ; do
for ifc in "$@" ; do for ifc in "$@" ; do
process_qdisc "$ifc" process_qdisc "$ifc"
done done
sleep "${INTERVAL%.000}" sleep "${INTERVAL%%.*}"
done done