]> arthur.barton.de Git - netdata.git/commitdiff
prevent forks in tc-qos-helper.sh
authorCosta Tsaousis <costa@tsaousis.gr>
Fri, 1 Jul 2016 21:24:20 +0000 (00:24 +0300)
committerCosta Tsaousis <costa@tsaousis.gr>
Fri, 1 Jul 2016 21:24:20 +0000 (00:24 +0300)
plugins.d/tc-qos-helper.sh

index d51f1088362db13e1ed2abc72bdba0be54858b24..94eec44a569dac63bb521c661e34a2480032f2ca 100755 (executable)
@@ -58,7 +58,7 @@ setclassname() {
 }
 
 show_tc() {
-       local x="${1}"
+       local x="${1}" interface_dev interface_classes interface_classes_monitor
 
        echo "BEGIN ${x}"
        ${tc} -s class show dev ${x}
@@ -66,17 +66,18 @@ show_tc() {
        # check FireQOS names for classes
        if [ ! -z "${fix_names}" -a -f "${fireqos_run_dir}/ifaces/${x}" ]
        then
-               name="$(cat "${fireqos_run_dir}/ifaces/${x}")"
+               name="$(<"${fireqos_run_dir}/ifaces/${x}")"
                echo "SETDEVICENAME ${name}"
 
+               interface_dev=
                interface_classes=
                interface_classes_monitor=
                source "${fireqos_run_dir}/${name}.conf"
                for n in ${interface_classes_monitor}
                do
-                       setclassname $(echo ${n} | tr '|' ' ')
+                       setclassname ${n//|/ }
                done
-               echo "SETDEVICEGROUP ${interface_dev}"
+               [ ! -z "${interface_dev}" ] && echo "SETDEVICEGROUP ${interface_dev}"
        fi
        echo "END ${x}"
 }