webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 08:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixed conn scheduler restart collectd when morning reconnect (graphs)"

Browse Source 
This reverts commit 67c532f594.
Syntax error and i think networking/red is a better place for restart
because a unwanted reconnect also make such problems
This commit is contained in:
Arne Fitzenreiter
2009-05-11 20:07:58 +02:00
parent 2f3973e495
commit ca530b2d9b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/scripts/connscheduler
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,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()
}