From: maniacikarus <maniacikarus@ipfire.org>
Date: Fri, 8 May 2009 05:43:06 +0000 (+0200)
Subject: Fixed conn scheduler restart collectd when morning reconnect (graphs)
X-Git-Tag: v2.5-beta3~22
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=67c532f594506464aed9fa95b63091bda5b723a9

Fixed conn scheduler restart collectd when morning reconnect (graphs)
---

diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler
index bc4d4eb656..824af248ab 100644
--- 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,12 +123,14 @@ 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
 }
 
 
@@ -168,7 +170,7 @@ sub profile
     ## FIXME: do we need to do this ?
     sleep($sleep_after_profile);
     &dial();
-  }  
+  }
 }
 
 
@@ -200,7 +202,7 @@ sub timer
     }
 
 
-    if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' )    
+    if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' )
     {
       &reconnect()
     }