tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-10-10 Junichi Satoh <junichi@rworks.jp> 

* 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
This commit is contained in:
jsatoh 2012-10-10 06:02:25 +00:00
parent 22d8a2d99b
commit 9e8c44dfad
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2012-10-10 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Fixed bug: periodic (monthly and weekly)
planned downtime is not stopped at expected time.
2012-10-09 Sancho Lerena <slerena@artica.es> 2012-10-09 Sancho Lerena <slerena@artica.es>
* util/plugin/mysql_plugin.sh: Fixed problem on composed * util/plugin/mysql_plugin.sh: Fixed problem on composed

4
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -1474,7 +1474,7 @@ sub pandora_planned_downtime_monthly_stop($$) {
# "%H:%M:%S"); # "%H:%M:%S");
# #
#if ($date_now_time <= $date_downtime) { #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'})) { || ($time eq $downtime->{'periodically_time_to'})) {
if (!defined($downtime->{'description'})) { if (!defined($downtime->{'description'})) {
@ -1650,7 +1650,7 @@ sub pandora_planned_downtime_weekly_stop($$) {
logger($pa_config, "Debug periodically_time_to = " . logger($pa_config, "Debug periodically_time_to = " .
$downtime->{'periodically_time_to'}, 5); $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'})) { || ($time eq $downtime->{'periodically_time_to'})) {
if (!defined($downtime->{'description'})) { if (!defined($downtime->{'description'})) {