Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

FIX: Remove unused mechanism for modules to add restart/reload actions after restart of pollers 21.10.x #11855

Merged
merged 1 commit into from
Sep 22, 2022
+0 −22
Merged

FIX: Remove unused mechanism for modules to add restart/reload actions after restart of pollers 21.10.x #11855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions www/class/centreon.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,22 +162,12 @@ public function creatModuleList()
$this->modules[$result["name"]] = array(
"name" => $result["name"],
"gen" => false,
"restart" => false,
"license" => false
);

if (is_dir("./modules/" . $result["name"] . "/generate_files/")) {
$this->modules[$result["name"]]["gen"] = true;
}
if (is_dir("./modules/" . $result["name"] . "/restart_pollers/")) {
$this->modules[$result["name"]]["restart"] = true;
}
if (is_dir("./modules/" . $result["name"] . "/restart_pollers/")) {
$this->modules[$result["name"]]["restart"] = true;
}
if (file_exists("./modules/" . $result["name"] . "/license/merethis_lic.zl")) {
$this->modules[$result["name"]]["license"] = true;
}
}
$dbResult = null;
}
Expand Down
12 changes: 0 additions & 12 deletions www/include/configuration/configGenerate/xml/restartPollers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,18 +246,6 @@ function log_error($errno, $errstr, $errfile, $errline)
$msg_restart[$key] = str_replace("\n", "<br>", $str);
}

/* Find restart / reload action from modules */
foreach ($centreon->modules as $key => $value) {
if (
$value["restart"]
&& $files = glob(_CENTREON_PATH_ . "www/modules/" . $key . "/restart_pollers/*.php")
) {
foreach ($files as $filename) {
include $filename;
}
}
}

$xml->startElement("response");
$xml->writeElement("status", $okMsg);
$xml->writeElement("statuscode", STATUS_OK);
Expand Down