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

2013-02-28 Sancho Lerena <slerena@artica.es> 

* Config.pm: updated version.

        * NetworkServer.pm,
        PluginServer.pm: Fixed some more un-init values and removed
        annoying message and not useful warning about empty return on SNMP call.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7760 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2013-02-28 17:45:20 +00:00
parent 13d7d562e0
commit d1d6b53250
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/ChangeLog
View File

@ -1,3 +1,11 @@
2013-02-28 Sancho Lerena <slerena@artica.es>
* Config.pm: updated version.
* NetworkServer.pm,
PluginServer.pm: Fixed some more un-init values and removed annoying
message and not useful warning about empty return on SNMP call.
2013-02-28 Dario Rodriguez <dario@artica.es> 2013-02-28 Dario Rodriguez <dario@artica.es>
* lib/PandoraFMS/DataServer.pm: Added feature to update custom field * lib/PandoraFMS/DataServer.pm: Added feature to update custom field

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

@ -43,7 +43,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "5.0dev"; my $pandora_version = "5.0dev";
my $pandora_build = "121210"; my $pandora_build = "130228";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

3
pandora_server/lib/PandoraFMS/NetworkServer.pm
View File

@ -316,7 +316,8 @@ sub pandora_snmp_get_command ($$$$$$$$$$$) {
return $output; return $output;
} }
} else { } else {
logger ($pa_config,"[ERROR] Undefined value returned SNMP query. Is the server out of memory?" , 0); logger ($pa_config,"[ERROR] Undefined value returned SNMP query. Is the server out of memory?" , 3);
logger ($pa_config,"[ERROR] Snmp Community: $snmp_community SNMP Target: $snmp_target OID: $snmp_oid", 3);
return ""; return "";
} }
} }

5
pandora_server/lib/PandoraFMS/PluginServer.pm
View File

@ -197,6 +197,11 @@ sub data_consumer ($$) {
eval { eval {
$module_data = `$command`; $module_data = `$command`;
}; };
# Empty ?
if (!defined($module_data)){
$module_data = "";
}
# Clean blank spaces and carriage return from start and end of the data # Clean blank spaces and carriage return from start and end of the data
$module_data =~ s/^[\s|\n|\r]*//; $module_data =~ s/^[\s|\n|\r]*//;