From ca530b2d9b2ee572531a831ee2bf6345190e4677 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 11 May 2009 20:07:58 +0200 Subject: [PATCH] Revert "Fixed conn scheduler restart collectd when morning reconnect (graphs)" This reverts commit 67c532f594506464aed9fa95b63091bda5b723a9. Syntax error and i think networking/red is a better place for restart because a unwanted reconnect also make such problems --- src/scripts/connscheduler | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler index 824af248ab..bc4d4eb656 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,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() } -- 2.39.2