Revert "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 824af248abe6de932a017e3f00c048da931bcfa0..bc4d4eb6562302b5fc60c2600604bf3226213e5a 100644 (file)
--- a/src/scripts/connscheduler
+++ b/src/scripts/connscheduler
@@ -79,11 +79,11 @@ sub hangup
     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-ipfire.pid' || $counter == 0 )
+  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) 
   {
     sleep 1;
     $counter--;
@@ -123,14 +123,12 @@ sub reconnect
   # wait maximum 60 seconds
   my $counter = 60;
   sleep 1;
-  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 )
+  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
 }
 
 
@@ -170,7 +168,7 @@ sub profile
     ## FIXME: do we need to do this ?
     sleep($sleep_after_profile);
     &dial();
-  }
+  }  
 }
 
 
@@ -202,7 +200,7 @@ sub timer
     }
 
 
-    if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' )
+    if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' )    
     {
       &reconnect()
     }