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

2009-08-20 Sancho lerena <slerena@artica.es> 

* lib/PandoraFMS/Tools.pm: Undone commit of 19/8 to fix ugly mesg from
        enterprise load: was  breaking enterprise....




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1869 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2009-08-20 15:48:42 +00:00
parent 8c3452ab60
commit bcddfe6dc9
2 changed files with 11 additions and 9 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 @@
2009-08-20 Sancho lerena <slerena@artica.es>
* lib/PandoraFMS/Tools.pm: Undone commit of 19/8 to fix ugly mesg from
enterprise load: was breaking enterprise....
2009-08-19 Manuel Arostegui <manuel@todo-linux.com> 2009-08-19 Manuel Arostegui <manuel@todo-linux.com>
* pandora_server.spec: Changed email. * pandora_server.spec: Changed email.

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

@ -352,15 +352,12 @@ sub enterprise_hook ($$) {
# Prepend the package name # Prepend the package name
$func = 'PandoraFMS::Enterprise::' . $func; $func = 'PandoraFMS::Enterprise::' . $func;
# Check if exist before try to call it # Try to call the function
my $output = `perl -e "use $func"`; my $output = eval { &$func (@args); };
if ($output){ # Check for errors
# Try to call the function return undef if ($@);
$output = eval { &$func (@args); };
} else {
return $undef;
}
return $output; return $output;
} }