Private GIT

Skip to content
Snippets Groups Projects
Commit 2b21c9f9 authored by Maximilien Bersoult's avatar Maximilien Bersoult
Browse files

* Fix #4363: The bad host id use in sendCommand

parent 5a336f3f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
cron/downtimeManager.php
+ 10
− 9
View file @ 2b21c9f9
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
foreach ($ext_cmd_add['host'] as $cmd) { foreach ($ext_cmd_add['host'] as $cmd) {
$cmd = sprintf($cmd, time(), $hostClass->getHostName($host), $dt[0], $dt[1], $period['dtp_fixed'], $period['dtp_duration'], $period['dt_id']); $cmd = sprintf($cmd, time(), $hostClass->getHostName($host), $dt[0], $dt[1], $period['dtp_fixed'], $period['dtp_duration'], $period['dt_id']);
if (!in_array($cmd, $existingDowntime)) { if (!in_array($cmd, $existingDowntime)) {
sendCommand($pearDB, $period['obj_id'], $cmd); sendCommand($pearDB, $host, $cmd);
$existingDowntime[] = $cmd; $existingDowntime[] = $cmd;
} }
} }
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
$cmd = sprintf('[%u] DEL_SVC_DOWNTIME;%u', time(), $schelDt['internal_downtime_id']); $cmd = sprintf('[%u] DEL_SVC_DOWNTIME;%u', time(), $schelDt['internal_downtime_id']);
} }
if (!in_array($cmd, $existingDowntime)) { if (!in_array($cmd, $existingDowntime)) {
sendCommand($pearDB, $period['obj_id'], $cmd); sendCommand($pearDB, $host, $cmd);
$existingDowntime[] = $cmd; $existingDowntime[] = $cmd;
} }
} }
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
foreach ($ext_cmd_add['svc'] as $cmd) { foreach ($ext_cmd_add['svc'] as $cmd) {
$cmd = sprintf($cmd, time(), $period['host_name'], $period['obj_name'], $dt[0], $dt[1], $period['dtp_fixed'], $period['dtp_duration'], $period['dt_id']); $cmd = sprintf($cmd, time(), $period['host_name'], $period['obj_name'], $dt[0], $dt[1], $period['dtp_fixed'], $period['dtp_duration'], $period['dt_id']);
if (!in_array($cmd, $existingDowntime)) { if (!in_array($cmd, $existingDowntime)) {
sendCommand($pearDB, $period['obj_id'], $cmd); sendCommand($pearDB, $hid, $cmd);
$existingDowntime[] = $cmd; $existingDowntime[] = $cmd;
} }
} }
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
$cmd = sprintf('[%u] DEL_SVC_DOWNTIME;%u', time(), $schelDt['internal_downtime_id']); $cmd = sprintf('[%u] DEL_SVC_DOWNTIME;%u', time(), $schelDt['internal_downtime_id']);
} }
if (!in_array($cmd, $existingDowntime)) { if (!in_array($cmd, $existingDowntime)) {
sendCommand($pearDB, $period['obj_id'], $cmd); sendCommand($pearDB, $hid, $cmd);
$existingDowntime[] = $cmd; $existingDowntime[] = $cmd;
} }
} }
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
foreach ($ext_cmd_add['svc'] as $cmd) { foreach ($ext_cmd_add['svc'] as $cmd) {
$cmd = sprintf($cmd, time(), $period['host_name'], $period['obj_name'], $dt[0], $dt[1], $period['dtp_fixed'], $period['dtp_duration'], $period['dt_id']); $cmd = sprintf($cmd, time(), $period['host_name'], $period['obj_name'], $dt[0], $dt[1], $period['dtp_fixed'], $period['dtp_duration'], $period['dt_id']);
if (!in_array($cmd, $existingDowntime)) { if (!in_array($cmd, $existingDowntime)) {
sendCommand($pearDB, $period['obj_id'], $cmd); sendCommand($pearDB, $hid, $cmd);
$existingDowntime[] = $cmd; $existingDowntime[] = $cmd;
} }
} }
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
$cmd = sprintf('[%u] DEL_SVC_DOWNTIME;%u', time(), $schelDt['internal_downtime_id']); $cmd = sprintf('[%u] DEL_SVC_DOWNTIME;%u', time(), $schelDt['internal_downtime_id']);
} }
if (!in_array($cmd, $existingDowntime)) { if (!in_array($cmd, $existingDowntime)) {
sendCommand($pearDB, $period['obj_id'], $cmd); sendCommand($pearDB, $hid, $cmd);
$existingDowntime[] = $cmd; $existingDowntime[] = $cmd;
} }
} }
...@@ -313,6 +313,7 @@ ...@@ -313,6 +313,7 @@
if (!isset($service[0])) { if (!isset($service[0])) {
continue; continue;
} }
$hid = $service[0];
$currentHostDate = $gmt->getHostCurrentDatetime($service[0], 'U'); $currentHostDate = $gmt->getHostCurrentDatetime($service[0], 'U');
$dts = $downtime->doSchedule($period['dt_id'], $currentHostDate, $delay, $period['dtp_start_time'], $period['dtp_end_time']); $dts = $downtime->doSchedule($period['dt_id'], $currentHostDate, $delay, $period['dtp_start_time'], $period['dtp_end_time']);
if (count($dts) != 0) { if (count($dts) != 0) {
...@@ -324,7 +325,7 @@ ...@@ -324,7 +325,7 @@
foreach ($ext_cmd_add['svc'] as $cmd) { foreach ($ext_cmd_add['svc'] as $cmd) {
$cmd = sprintf($cmd, time(), $host_name, $service_name, $dt[0], $dt[1], $period['dtp_fixed'], $period['dtp_duration'], $period['dt_id']); $cmd = sprintf($cmd, time(), $host_name, $service_name, $dt[0], $dt[1], $period['dtp_fixed'], $period['dtp_duration'], $period['dt_id']);
if (!in_array($cmd, $existingDowntime)) { if (!in_array($cmd, $existingDowntime)) {
sendCommand($pearDB, $period['obj_id'], $cmd); sendCommand($pearDB, $hid, $cmd);
$existingDowntime[] = $cmd; $existingDowntime[] = $cmd;
} }
} }
...@@ -336,7 +337,7 @@ ...@@ -336,7 +337,7 @@
$cmd = sprintf('[%u] DEL_SVC_DOWNTIME;%u', time(), $schelDt['internal_downtime_id']); $cmd = sprintf('[%u] DEL_SVC_DOWNTIME;%u', time(), $schelDt['internal_downtime_id']);
} }
if (!in_array($cmd, $existingDowntime)) { if (!in_array($cmd, $existingDowntime)) {
sendCommand($pearDB, $period['obj_id'], $cmd); sendCommand($pearDB, $hid, $cmd);
$existingDowntime[] = $cmd; $existingDowntime[] = $cmd;
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Another place to be (or not)