Browse Source

collectd: sqm_collect: tidy interval string handling

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
lilik-openwrt-22.03
Kevin Darbyshire-Bryant 5 years ago
committed by Kevin Darbyshire-Bryant
parent
commit
c2c91ea99e
2 changed files with 4 additions and 5 deletions
  1. +1
    -1
      utils/collectd/Makefile
  2. +3
    -4
      utils/collectd/files/exec-scripts/sqm_collectd.sh

+ 1
- 1
utils/collectd/Makefile View File

@ -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/ \


+ 3
- 4
utils/collectd/files/exec-scripts/sqm_collectd.sh View File

@ -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

Loading…
Cancel
Save