From 33cb2abf1ed352aa054b23f095992c7e597fce78 Mon Sep 17 00:00:00 2001 From: jsatoh Date: Wed, 10 Oct 2012 06:02:25 +0000 Subject: [PATCH] 2012-10-10 Junichi Satoh * lib/PandoraFMS/Core.pm: Fixed bug: periodic (monthly and weekly) planned downtime is not stopped at expected time. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7062 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 5 +++++ pandora_server/lib/PandoraFMS/Core.pm | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 0fda829612..b2b15c3f82 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2012-10-10 Junichi Satoh + + * lib/PandoraFMS/Core.pm: Fixed bug: periodic (monthly and weekly) + planned downtime is not stopped at expected time. + 2012-10-09 Sancho Lerena * util/plugin/mysql_plugin.sh: Fixed problem on composed diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 2a49810475..80a11cf703 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1474,7 +1474,7 @@ sub pandora_planned_downtime_monthly_stop($$) { # "%H:%M:%S"); # #if ($date_now_time <= $date_downtime) { - if (($time lt $downtime->{'periodically_time_to'}) + if (($time gt $downtime->{'periodically_time_to'}) || ($time eq $downtime->{'periodically_time_to'})) { if (!defined($downtime->{'description'})) { @@ -1650,7 +1650,7 @@ sub pandora_planned_downtime_weekly_stop($$) { logger($pa_config, "Debug periodically_time_to = " . $downtime->{'periodically_time_to'}, 5); - if (($time lt $downtime->{'periodically_time_to'}) + if (($time gt $downtime->{'periodically_time_to'}) || ($time eq $downtime->{'periodically_time_to'})) { if (!defined($downtime->{'description'})) {