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

Fixed that monthly type of planned downtime is not executed at intended time. 

And fixed comments.
This commit is contained in:
Junichi Satoh 2018-09-21 11:10:50 +09:00
parent fa05ecc477
commit d4d978c9ad
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1914,7 +1914,7 @@ sub pandora_planned_downtime_unset_quiet_elements($$$) {
######################################################################## ########################################################################
=head2 C<< pandora_planned_downtime_quiet_once_stop (I<$pa_config>, I<$dbh>) >> =head2 C<< pandora_planned_downtime_quiet_once_stop (I<$pa_config>, I<$dbh>) >>
Start the planned downtime, the once type. Stop the planned downtime, the once type.
=cut =cut
######################################################################## ########################################################################
@ -1922,7 +1922,7 @@ sub pandora_planned_downtime_quiet_once_stop($$) {
my ($pa_config, $dbh) = @_; my ($pa_config, $dbh) = @_;
my $utimestamp = time(); my $utimestamp = time();
# Stop pending downtimes # Stop executed downtimes
my @downtimes = get_db_rows($dbh, 'SELECT * my @downtimes = get_db_rows($dbh, 'SELECT *
FROM tplanned_downtime FROM tplanned_downtime
WHERE type_downtime = ? WHERE type_downtime = ?
@ -2023,8 +2023,8 @@ sub pandora_planned_downtime_monthly_start($$) {
AND type_execution <> ' . $RDBMS_QUOTE_STRING . 'once' . $RDBMS_QUOTE_STRING . ' AND type_execution <> ' . $RDBMS_QUOTE_STRING . 'once' . $RDBMS_QUOTE_STRING . '
AND ((periodically_day_from = ? AND periodically_time_from <= ?) OR (periodically_day_from < ?)) AND ((periodically_day_from = ? AND periodically_time_from <= ?) OR (periodically_day_from < ?))
AND ((periodically_day_to = ? AND periodically_time_to >= ?) OR (periodically_day_to > ?))', AND ((periodically_day_to = ? AND periodically_time_to >= ?) OR (periodically_day_to > ?))',
'monthly', 'number_day_month', 'monthly',
$time, $number_day_month, $number_day_month, $time, $number_day_month,
$number_day_month, $time, $number_day_month); $number_day_month, $time, $number_day_month);
foreach my $downtime (@downtimes) { foreach my $downtime (@downtimes) {
@ -2061,7 +2061,7 @@ sub pandora_planned_downtime_monthly_start($$) {
######################################################################## ########################################################################
=head2 C<< pandora_planned_downtime_monthly_stop (I<$pa_config>, I<$dbh>) >> =head2 C<< pandora_planned_downtime_monthly_stop (I<$pa_config>, I<$dbh>) >>
Start the planned downtime, the montly type. Stop the planned downtime, the monthly type.
=cut =cut
######################################################################## ########################################################################
@ -2092,7 +2092,7 @@ sub pandora_planned_downtime_monthly_stop($$) {
$number_day_month = 31; $number_day_month = 31;
} }
# Start pending downtimes # Stop executed downtimes
my @downtimes = get_db_rows($dbh, 'SELECT * my @downtimes = get_db_rows($dbh, 'SELECT *
FROM tplanned_downtime FROM tplanned_downtime
WHERE type_periodicity = ? WHERE type_periodicity = ?
@ -2138,7 +2138,7 @@ sub pandora_planned_downtime_monthly_stop($$) {
######################################################################## ########################################################################
=head2 C<< pandora_planned_downtime_weekly_start (I<$pa_config>, I<$dbh>) >> =head2 C<< pandora_planned_downtime_weekly_start (I<$pa_config>, I<$dbh>) >>
Start the planned downtime, the montly type. Start the planned downtime, the weekly type.
=cut =cut
######################################################################## ########################################################################
@ -2247,7 +2247,7 @@ sub pandora_planned_downtime_weekly_start($$) {
######################################################################## ########################################################################
=head2 C<< pandora_planned_downtime_weekly_stop (I<$pa_config>, I<$dbh>) >> =head2 C<< pandora_planned_downtime_weekly_stop (I<$pa_config>, I<$dbh>) >>
Stop the planned downtime, the montly type. Stop the planned downtime, the weekly type.
=cut =cut
######################################################################## ########################################################################
@ -2263,7 +2263,7 @@ sub pandora_planned_downtime_weekly_stop($$) {
my $found = 0; my $found = 0;
my $stop_downtime = 0; my $stop_downtime = 0;
# Start pending downtimes # Stop executed downtimes
my @downtimes = get_db_rows($dbh, 'SELECT * my @downtimes = get_db_rows($dbh, 'SELECT *
FROM tplanned_downtime FROM tplanned_downtime
WHERE type_periodicity = ? WHERE type_periodicity = ?