Fixed conn scheduler restart collectd when morning reconnect (graphs)

This commit is contained in:
maniacikarus
2009-05-08 07:43:06 +02:00
parent 288f5323ea
commit 67c532f594

View File

@@ -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()
}