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

2011-02-16 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/DataServer.pm: Do not update the module description
	  if it's empty. Fixes bug #3162637.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3880 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2011-02-16 16:50:19 +00:00
parent c9189d19ff
commit 7cc8e631c8
2 changed files with 6 additions and 1 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 @@
2011-02-16 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Do not update the module description
if it's empty. Fixes bug #3162637.
2011-02-16 Junichi Satoh <junichi@rworks.jp>
* FreeBSD/tentacle_server: Added a filter option.

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

@ -567,7 +567,7 @@ sub update_module_configuration ($$$$) {
$module->{'module_interval'} != $module_conf->{'module_interval'}) {
logger($pa_config, "Updating configuration for module '" . $module->{'nombre'} . "'.", 10);
db_do ($dbh, 'UPDATE tagente_modulo SET min = ?, max = ?, descripcion = ?, post_process = ?, module_interval = ?
WHERE id_agente_modulo = ?', $module_conf->{'min'}, $module_conf->{'max'}, $module_conf->{'descripcion'},
WHERE id_agente_modulo = ?', $module_conf->{'min'}, $module_conf->{'max'}, $module_conf->{'descripcion'} eq '' ? $module->{'descripcion'} : $module_conf->{'descripcion'},
$module_conf->{'post_process'}, $module_conf->{'module_interval'}, $module->{'id_agente_modulo'});
return;
}