summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2014-06-19 10:32:05 +0545
committerjim-p <jimp@pfsense.org>2014-06-20 10:25:59 -0400
commitefac3a1346867481d6cfcea62c131ad0c0de391b (patch)
tree7bc59b914bb8430416f87d40c871efc0feae516d
parente792ac36324e3376763699344742d5dc49eab99c (diff)
downloadpfsense-efac3a1346867481d6cfcea62c131ad0c0de391b.zip
pfsense-efac3a1346867481d6cfcea62c131ad0c0de391b.tar.gz
Only include a scheduled rule if it is strictly before the end timeRELENG_2_1_4
The exact moment of the end time is the end of the schedule. We do not want to include a rule when filter_configure_sync wakes up at 00:15:00 etc and is on a not-slow system that processes this code during the interval 00:15:00 to 00:15:01. This should help intermittent issues with schedules not finishing at the appropriate 15-minute boundary. Might help or fix #3558
-rw-r--r--etc/inc/filter.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 153c934..c49403a 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -3262,7 +3262,7 @@ function filter_tdr_hour($schedule) {
$now = strtotime("now");
if($g['debug'])
log_error("[TDR DEBUG] S: $starting_time E: $ending_time N: $now");
- if($now >= $starting_time and $now <= $ending_time)
+ if($now >= $starting_time and $now < $ending_time)
return true;
return false;
}
OpenPOWER on IntegriCloud