Fixed conn scheduler restart collectd when morning reconnect (graphs)

[people/pmueller/ipfire-2.x.git] / src / scripts / connscheduler

diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler
index c4ea8dc1d4f4e0ecb6e91b62aa9ec6d3ab948dd5..824af248abe6de932a017e3f00c048da931bcfa0 100644 (file)
--- a/src/scripts/connscheduler
+++ b/src/scripts/connscheduler
@@ -3,6 +3,8 @@
 # IPFire Connection Scheduler (F)Cron Job
 #
 # This code is distributed under the terms of the GPL
+# The original code is taken from weizen_42.
+# See /home/httpd/cgi-bin/connscheduler.cgi
 #
 
 use strict;
@@ -10,7 +12,6 @@ use strict;
 require '/var/ipfire/general-functions.pl';
 require '/var/ipfire/connscheduler/lib.pl';
 
-
 # seems to be necessary
 my $sleep_after_profile = 5;
 
@@ -62,6 +63,9 @@ exit 0;
 #
 sub hangup
 {
+  # Kill connectd if running to prevent redial
+  system('/bin/killall', 'connectd');
+
   unless ( -e "${General::swroot}/red/active" )
   {
     &General::log("ConnSched already disconnected");
@@ -69,17 +73,20 @@ sub hangup
   }
 
   &General::log("ConnSched disconnect");
-  unless ( system('/etc/rc.d/rc.red', 'stop') == 0 )
+  unless ( system('/etc/rc.d/init.d/network', 'stop', 'red') == 0 )
   {
     &General::log("ConnSched disconnect failed: $?");
     return;
   }
 
-  # now wait for active triggerfile and ppp daemon to disappear 
+  # now wait for active triggerfile and ppp daemon to disappear
+  # wait maximum 60 seconds
+  my $counter = 60;
   sleep 1;
-  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipcop.pid' ) 
+  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 )
   {
     sleep 1;
+    $counter--;
   }
 }
 
@@ -93,7 +100,7 @@ sub dial
   }
 
   &General::log("ConnSched connect");
-  unless ( system('/etc/rc.d/rc.red', 'start') == 0 )
+  unless ( system('/etc/rc.d/init.d/network', 'start', 'red') == 0 )
   {
     &General::log("ConnSched connect failed: $?");
     return;
@@ -112,7 +119,18 @@ sub dial
 sub reconnect
 {
   &hangup() if ( -e "${General::swroot}/red/active" );
+  # now wait for active triggerfile and ppp daemon to disappear
+  # wait maximum 60 seconds
+  my $counter = 60;
+  sleep 1;
+  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 )
+  {
+    sleep 1;
+    $counter--;
+  }
+  /etc/init.d/collectd stop
   &dial();
+  /etc/init.d/collectd start
 }
 
 
@@ -145,14 +163,14 @@ sub profile
   # Method to change Profile from pppsetup.cgi
        unlink("${General::swroot}/ppp/settings");
        link("${General::swroot}/ppp/settings-$profile", "${General::swroot}/ppp/settings");
-       system ("/bin/touch", "${General::swroot}/ppp/updatesettings");
+       system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings");
 
   if ( $restart_red == 1 )
   {
     ## FIXME: do we need to do this ?
     sleep($sleep_after_profile);
     &dial();
-  }  
+  }
 }
 
 
@@ -184,7 +202,7 @@ sub timer
     }
 
 
-    if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' )    
+    if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' )
     {
       &reconnect()
     }