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

Merge branch 'ent-6856-Warning-feo-server' into 'develop' 

Applied fix

Closes pandora_enterprise#6856

See merge request artica/pandorafms!3725
This commit is contained in:
Daniel Rodriguez 2020-12-23 16:06:24 +01:00
parent ccf806755b 13d7889cc4
commit 1324725263
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1556,6 +1556,10 @@ sub ping ($$) {
1 1
); );
# Set default values if config is not defined.
$timeout = 4 if !defined($timeout);
$retries = 4 if !defined($retries);
# Windows # Windows
if (($^O eq "MSWin32") || ($^O eq "MSWin32-x64") || ($^O eq "cygwin")){ if (($^O eq "MSWin32") || ($^O eq "MSWin32-x64") || ($^O eq "cygwin")){
$timeout *= 1000; # Convert the timeout to milliseconds. $timeout *= 1000; # Convert the timeout to milliseconds.