From 2ea172ab77531d562b216d950a410080b9fce14c Mon Sep 17 00:00:00 2001 From: jsatoh Date: Mon, 6 Jan 2014 05:08:53 +0000 Subject: [PATCH] 2014-01-06 Junichi Satoh * lib/PandoraFMS/Core.pm: Fixed that planned downtime is disabled between continuous time settings. eg) If there are two settings like xx:xx:xx-23:59:59 and 00:00:00-yy:yy:yy, planned downtime was disabled around 00:00:00. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9288 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 7 +++++++ pandora_server/lib/PandoraFMS/Core.pm | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 61f8c4bc77..0273f7a631 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,10 @@ +2014-01-06 Junichi Satoh + + * lib/PandoraFMS/Core.pm: Fixed that planned downtime is disabled + between continuous time settings. + eg) If there are two settings like xx:xx:xx-23:59:59 and + 00:00:00-yy:yy:yy, planned downtime was disabled around 00:00:00. + 2013-12-27 Sancho Lerena * util/pandora_backup.sh: Added parameter to ensure max_allowed_packet diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 2d52b5bdcf..64c14c3460 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1826,17 +1826,17 @@ Update planned downtimes. sub pandora_planned_downtime ($$) { my ($pa_config, $dbh) = @_; - pandora_planned_downtime_disabled_once_start($pa_config, $dbh); pandora_planned_downtime_disabled_once_stop($pa_config, $dbh); + pandora_planned_downtime_disabled_once_start($pa_config, $dbh); - pandora_planned_downtime_quiet_once_start($pa_config, $dbh); pandora_planned_downtime_quiet_once_stop($pa_config, $dbh); + pandora_planned_downtime_quiet_once_start($pa_config, $dbh); - pandora_planned_downtime_monthly_start($pa_config, $dbh); pandora_planned_downtime_monthly_stop($pa_config, $dbh); + pandora_planned_downtime_monthly_start($pa_config, $dbh); - pandora_planned_downtime_weekly_start($pa_config, $dbh); pandora_planned_downtime_weekly_stop($pa_config, $dbh); + pandora_planned_downtime_weekly_start($pa_config, $dbh); } ########################################################################