summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2014-06-19 10:32:05 +0545
committerPhil Davis <phil.davis@inf.org>2014-06-19 10:32:05 +0545
commita43c5bdea7ee07a5075d8c22a7a247424669e6f3 (patch)
treed9146056eb3cc01d96f1e4ed9376d05264f5b35b
parentaba02f656010bc190b5db0e0c659f8f79402b6a9 (diff)
downloadpfsense-a43c5bdea7ee07a5075d8c22a7a247424669e6f3.zip
pfsense-a43c5bdea7ee07a5075d8c22a7a247424669e6f3.tar.gz
Only include a scheduled rule if it is strictly before the end time
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 6526d44..e382bac 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -3418,7 +3418,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