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

2007-12-19 Sancho Lerena <slerena@gmail.com> 

* bin/pandora_network: Fixed bug #1854340, problem with file descriptors
        on heavily loaded network servers. Other minor issues added.

        * lib/Config.pm: Upgraded version number to 1.4-dev




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@685 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2007-12-19 18:45:32 +00:00
parent b3f4668b7c
commit aba6bd86d9
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2007-12-19 Sancho Lerena <slerena@gmail.com>
* bin/pandora_network: Fixed bug #1854340, problem with file descriptors
on heavily loaded network servers. Other minor issues added.
* lib/Config.pm: Upgraded version number to 1.4-dev
2007-12-17 Ramon Novoa <rnovoa@artica.es>
* util/n2p.pl: Added to repository. Nagios to Pandora FMS migration

10
pandora_server/bin/pandora_network
View File

@ -264,7 +264,6 @@ sub pandora_ping_icmp {
my $result = 0;
my $result2 = 0;
my $temp;
my $p;
if ($pa_config->{'icmp_checks'} eq ""){
$pa_config->{'icmp_checks'} = 1;
@ -272,6 +271,7 @@ sub pandora_ping_icmp {
# Make more than a single ping (as defined in icmp_checks
for ($temp =0; $temp < $pa_config->{'icmp_checks'}; $temp++){
my $p;
# Some hosts don't accept ICMP with too small payload. Use 16 Bytes min
{
lock $icmp_lock;
@ -286,6 +286,7 @@ sub pandora_ping_icmp {
$temp = $pa_config->{'icmp_checks'}; # Exit for
}
}
undef ($p);
}
return $result2;
}
@ -318,6 +319,7 @@ sub pandora_ping_latency {
$$module_data = 0;
}
$nm->close();
undef($nm);
}
##########################################################################
@ -397,6 +399,7 @@ sub pandora_query_tcp (%$$$$$$$) {
}
}
$handle->close();
undef ($handle);
} else { # Cannot connect (open sock failed)
$$module_result = 1; # Fail
if ($id_tipo_modulo == 9){ # TCP Proc
@ -424,7 +427,7 @@ sub pandora_query_snmp (%$$$$) {
Retries => 0,
Community => $snmp_community,
Version => 1);
if ( (!defined($SESSION)) && ($snmp_target != "") && ($snmp_community != "") && ($snmp_oid != "")) {
if ( (!defined($SESSION)) && ($snmp_target ne "") && ($snmp_community ne "") && ($snmp_oid ne "")) {
logger($pa_config, "SNMP ERROR SESSION for Target $snmp_target ", 2);
$_[4] = "1";
} else {
@ -451,6 +454,8 @@ sub pandora_query_snmp (%$$$$) {
# Pass the VarList to getnext building an array of the output
my @OIDINFO = $SESSION->getnext($OIDLIST);
$output = $OIDINFO[0];
undef ($OIDLIST);
}
if ((!defined($output)) || ($output eq "")){
$_[4] = "1";
@ -458,6 +463,7 @@ sub pandora_query_snmp (%$$$$) {
} else {
$_[4] = "0";
}
undef ($SESSION);
}
return $output;
}

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

@ -34,8 +34,8 @@ our @EXPORT = qw( pandora_help_screen
# There is no global vars, all variables (setup) passed as hash reference
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "1.3.1";
my $pandora_build="PS071203";
my $pandora_version = "1.4-dev";
my $pandora_build="PS071219";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash