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

Do not add disabled modules to the execution queue.

This commit is contained in:
Ramon Novoa 2019-05-27 11:55:42 +02:00
parent 1529a04507
commit 36a12d16be
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_agents/unix/pandora_agent
View File

@ -536,6 +536,12 @@ sub parse_conf_modules($) {
# Check for invalid modules # Check for invalid modules
next unless (($module->{'name'} ne '' && $module->{'func'} != 0) || $module->{'func'} == \&module_plugin); next unless (($module->{'name'} ne '' && $module->{'func'} != 0) || $module->{'func'} == \&module_plugin);
# Skip disabled modules.
if (defined($module->{'disabled'}) && $module->{'disabled'} == 1) {
log_message('setup', 'Skipping disabled module "' . $module->{'name'} . '"');
next;
}
# Set the intensive interval # Set the intensive interval
if ($module->{'is_intensive'} == 1) { if ($module->{'is_intensive'} == 1) {
$module->{'intensive_interval'} = $module->{'interval'}; $module->{'intensive_interval'} = $module->{'interval'};

6
pandora_agents/win32/modules/pandora_module_factory.cc
View File

@ -1117,6 +1117,12 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
} }
} }
/* Skip disabled modules */
if (module_disabled == "1") {
pandoraLog ("Skipping disabled module \"%s\"", module_name.c_str ());
return NULL;
}
/* Create module objects */ /* Create module objects */
if (module_exec != "") { if (module_exec != "") {
module = new Pandora_Module_Exec (module_name, module = new Pandora_Module_Exec (module_name,