Remove error message if no ppp0.rrd exist yet.

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / networking / red

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 1a795830604e82411ebb4501f3b00db67bc84b42..57393842284773133cda5a7f5a949088b4f3eb00 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -19,6 +19,12 @@
 
 . /etc/sysconfig/rc 
 . ${rc_functions}
+
+eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
+if [ "$RRDLOG" == "" ]; then
+       RRDLOG=/var/log/rrd
+fi
+
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
 TYPE="${RED_TYPE}"
@@ -73,10 +79,6 @@ fi
 
 case "${1}" in
        start)
-               # Stop collectd if running
-               if [ "$(ps -A | grep " collectd$")" != "" ]; then
-                       /etc/rc.d/init.d/collectd stop
-               fi
                if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then
                        boot_mesg "Bringing up the ${DEVICE} interface..."
                        boot_mesg_flush
@@ -91,7 +93,6 @@ case "${1}" in
                        else
                                boot_mesg "Interface ${DEVICE} doesn't exist." ${FAILURE}
                                echo_failure
-                               /etc/rc.d/init.d/collectd start
                                exit 1
                        fi
                fi
@@ -137,7 +138,6 @@ case "${1}" in
                                else
                                        boot_mesg "dhcpcd already running!" ${WARNING}
                                        echo_warning
-                                       /etc/rc.d/init.d/collectd start
                                        exit 2
                                fi
                        fi
@@ -191,7 +191,6 @@ case "${1}" in
                        if ( ps ax | grep -q [p]ppd ); then 
                            boot_mesg "pppd is still running." ${FAILURE}
                            echo_failure
-                           /etc/init.d/collectd start
                            exit 1
                        fi
                        
@@ -227,7 +226,6 @@ case "${1}" in
                                if [ "$PPP_NIC" == "" ]; then
                                        boot_mesg "No device for red interface given. Check netsetup or dialprofile!" ${FAILURE}
                                        echo_failure
-                                       /etc/rc.d/init.d/collectd start
                                        exit 0
                                fi
                                boot_mesg "Bringing up the $TYPE interface on $PPP_NIC ..."
@@ -365,7 +363,9 @@ case "${1}" in
                        ## Create & Enable vnstat
                        /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
                        /etc/rc.d/init.d/connectd start
-                       /etc/rc.d/init.d/collectd start
+                       # Add a NaN value to ppp0 rrd to supress spikes at reconnect
+                       rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
+                               $(date +%s):: > /dev/null 2>&1
                        exit 0
                fi
                ;;
@@ -422,6 +422,9 @@ case "${1}" in
                        rm -f /var/ipfire/red/keepconnected
                        killall -w -s TERM /usr/sbin/pppd 2>/dev/null
                        evaluate_retval
+                       # Add a NaN value to ppp0 rrd to supress spikes at reconnect
+                       rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
+                               $(date +%s):: > /dev/null 2>&1
                fi
 
                if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then