tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-04-17 Ramon Novoa <rnovoa@artica.es>

Browse Source 
* lib/PandoraFMS/DataServer.pm: Update the module interval. Fixes bug
	  #3610666.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8007 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2013-04-17 17:59:49 +00:00
parent 3ee5ecf989
commit a99f32ebb6
2 changed files with 11 additions and 3 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 @@
2013-04-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Update the module interval. Fixes bug
#3610666.
2013-04-17 Ramon Novoa <rnovoa@artica.es> 2013-04-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Server.pm, * lib/PandoraFMS/Server.pm,

9
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -547,6 +547,7 @@ sub process_module_data ($$$$$$$$$) {
$ModuleSem->down (); $ModuleSem->down ();
my $module = get_db_single_row ($dbh, 'SELECT * FROM tagente_modulo WHERE id_agente = ? AND ' . db_text ('nombre') . ' = ?', $agent->{'id_agente'}, safe_input($module_name)); my $module = get_db_single_row ($dbh, 'SELECT * FROM tagente_modulo WHERE id_agente = ? AND ' . db_text ('nombre') . ' = ?', $agent->{'id_agente'}, safe_input($module_name));
if (! defined ($module)) { if (! defined ($module)) {
# Do not auto create modules # Do not auto create modules
if ($pa_config->{'autocreate'} ne '1') { if ($pa_config->{'autocreate'} ne '1') {
logger($pa_config, "Module '$module_name' not found for agent '$agent_name' and module auto-creation disabled.", 10); logger($pa_config, "Module '$module_name' not found for agent '$agent_name' and module auto-creation disabled.", 10);
@ -619,6 +620,7 @@ sub process_module_data ($$$$$$$$$) {
# Set default values # Set default values
$module_conf->{'descripcion'} = $module->{'descripcion'} unless defined ($module_conf->{'descripcion'}); $module_conf->{'descripcion'} = $module->{'descripcion'} unless defined ($module_conf->{'descripcion'});
$module_conf->{'extended_info'} = $module->{'extended_info'} unless defined ($module_conf->{'extended_info'}); $module_conf->{'extended_info'} = $module->{'extended_info'} unless defined ($module_conf->{'extended_info'});
$module_conf->{'module_interval'} = $module->{'module_interval'} unless defined ($module_conf->{'module_interval'});
} }
# Update module configuration if in learning mode and not a policy module # Update module configuration if in learning mode and not a policy module
@ -702,13 +704,13 @@ sub update_module_configuration ($$$$) {
my ($pa_config, $dbh, $module, $module_conf) = @_; my ($pa_config, $dbh, $module, $module_conf) = @_;
# Update if at least one of the configuration tokens has changed # Update if at least one of the configuration tokens has changed
foreach my $conf_token ('descripcion', 'extended_info') { foreach my $conf_token ('descripcion', 'extended_info', 'module_interval') {
if ($module->{$conf_token} ne $module_conf->{$conf_token}) { if ($module->{$conf_token} ne $module_conf->{$conf_token}) {
logger ($pa_config, "Updating configuration for module '" . safe_output($module->{'nombre'}) . "'.", 10); logger ($pa_config, "Updating configuration for module '" . safe_output($module->{'nombre'}) . "'.", 10);
db_do ($dbh, 'UPDATE tagente_modulo SET descripcion = ?, extended_info = ? db_do ($dbh, 'UPDATE tagente_modulo SET descripcion = ?, extended_info = ?, module_interval = ?
WHERE id_agente_modulo = ?', $module_conf->{'descripcion'} eq '' ? $module->{'descripcion'} : $module_conf->{'descripcion'}, WHERE id_agente_modulo = ?', $module_conf->{'descripcion'} eq '' ? $module->{'descripcion'} : $module_conf->{'descripcion'},
$module_conf->{'extended_info'}, $module->{'id_agente_modulo'}); $module_conf->{'extended_info'}, $module_conf->{'module_interval'}, $module->{'id_agente_modulo'});
last; last;
} }
} }
@ -716,6 +718,7 @@ sub update_module_configuration ($$$$) {
# Update module hash # Update module hash
$module->{'extended_info'} = $module_conf->{'extended_info'} if (defined($module_conf->{'extended_info'})) ; $module->{'extended_info'} = $module_conf->{'extended_info'} if (defined($module_conf->{'extended_info'})) ;
$module->{'descripcion'} = ($module_conf->{'descripcion'} eq '') ? $module->{'descripcion'} : $module_conf->{'descripcion'}; $module->{'descripcion'} = ($module_conf->{'descripcion'} eq '') ? $module->{'descripcion'} : $module_conf->{'descripcion'};
$module->{'module_interval'} = ($module_conf->{'module_interval'} eq '') ? $module->{'module_interval'} : $module_conf->{'module_interval'};
} }
1; 1;