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

2008-12-23 Ramon Novoa <rnovoa@artica.es> 

* bin/pandora_recon: Added a timeout to pandora_getparent(). The call
          to traceroute() would hang despite query_timeout being set.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1302 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2008-12-23 13:06:45 +00:00
parent 5022fa5e22
commit eeb88d1fb0
2 changed files with 12 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 @@
2008-12-23 Ramon Novoa <rnovoa@artica.es>
* bin/pandora_recon: Added a timeout to pandora_getparent(). The call
to traceroute() would hang despite query_timeout being set.
2008-12-10 Evi Vanoost <vanooste@rcbi.rochester.edu>
* lib/PandoraFMS/DB.pm: New table layout doesn't require timestamp anymore

8
pandora_server/bin/pandora_recon
View File

@ -673,7 +673,13 @@ sub pandora_getparent ($$){
);
my $success = 0;
$success = $t->traceroute();
eval {
local $SIG{ALRM} = sub { die "alarm" };
alarm($pa_config->{"networktimeout"});
$success = $t->traceroute();
alarm(0);
};
if ($t->hops > 1){
if ($success){
my $parent_ip = $t->hop_query_host($t->hops-1,0);