tyler.durden/centreon-plugins
1
0
Fork 0
mirror of https://github.com/centreon/centreon-plugins.git synced 2025-07-26 23:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Avoid loop !

Browse Source
This commit is contained in:
garnier-quentin 2015-06-24 17:12:56 +02:00
parent db7b35b06a
commit ed53a65b12
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
centreon/plugins/misc.pm
View File

@ -215,10 +215,12 @@ sub mymodule_load {
require $file;
};
if ($@) {
return 1 if (defined($options{no_quit}) && $options{no_quit} == 1);
$options{output}->add_option_msg(long_msg => $@);
$options{output}->add_option_msg(short_msg => $options{error_msg});
$options{output}->option_exit();
}
return 0;
}
sub backtick {

21
centreon/plugins/output.pm
View File

@ -592,8 +592,11 @@ sub is_litteral_status {
sub create_json_document {
my ($self) = @_;
centreon::plugins::misc::mymodule_load(output => $self, module => 'JSON',
error_msg => "Cannot load module 'JSON'.");
if (centreon::plugins::misc::mymodule_load(no_quit => 1, module => 'JSON',
error_msg => "Cannot load module 'JSON'.")) {
print "Cannot load module 'JSON'\n";
$self->exit(exit_litteral => 'unknown');
}
$self->{is_output_json} = 1;
$self->{json_output} = JSON->new->utf8();
}
@ -601,8 +604,11 @@ sub create_json_document {
sub create_xml_document {
my ($self) = @_;
centreon::plugins::misc::mymodule_load(output => $self, module => 'XML::LibXML',
error_msg => "Cannot load module 'XML::LibXML'.");
if (centreon::plugins::misc::mymodule_load(no_quit => 1, module => 'XML::LibXML',
error_msg => "Cannot load module 'XML::LibXML'.")) {
print "Cannot load module 'XML::LibXML'\n";
$self->exit(exit_litteral => 'unknown');
}
$self->{is_output_xml} = 1;
$self->{xml_output} = XML::LibXML::Document->new('1.0', 'utf-8');
}
@ -700,8 +706,11 @@ sub to_utf8 {
# Some Perl version dont have the following module (like Perl 5.6.x)
centreon::plugins::misc::mymodule_load(output => $self, module => 'Encode',
error_msg => "Cannot load module 'Encode'.");
if (centreon::plugins::misc::mymodule_load(no_quit => 1, module => 'Encode',
error_msg => "Cannot load module 'Encode'.")) {
print "Cannot load module 'Encode'\n";
$self->exit(exit_litteral => 'unknown');
}
$self->{encode_utf8_import} = 1;
eval '$self->{perlqq} = Encode::PERLQQ';