hhf/MySQLTuner-perl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix dependency check for Text::Template

Browse source 
fixes #133 and #136
This commit is contained in:
Christian Loos 2015-11-23 08:40:00 +01:00
parent 66d132cd4b
commit 11a8110922
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
mysqltuner.pl
View file

@ -645,19 +645,6 @@ sub mysql_setup {
} }
} }
sub try_load {
my $mod = shift;
eval("use $mod");
if ($@) {
#print "\$@ = $@\n";
return(0);
} else {
return(1);
}
}
# MySQL Request Array # MySQL Request Array
sub select_array { sub select_array {
my $req = shift; my $req = shift;
@ -2804,17 +2791,20 @@ sub dump_result {
debugprint "HTML REPORT: $opt{'reportfile'}"; debugprint "HTML REPORT: $opt{'reportfile'}";
if ($opt{'reportfile'} ne 0 ) { if ($opt{'reportfile'} ne 0 ) {
if (try_load('Text::Template')) { eval "{ use Text::Template }";
if ($@) {
badprint "Text::Template Module is needed."; badprint "Text::Template Module is needed.";
exit 1; exit 1;
} }
use Text::Template;
my $vars= {'data' => Dumper( \%result ) }; my $vars= {'data' => Dumper( \%result ) };
my $template = Text::Template->new(TYPE => 'STRING', PREPEND => q{;}, SOURCE => $templateModel) my $template;
or die "Couldn't construct template: $Text::Template::ERROR"; {
no warnings 'once';
$template = Text::Template->new(TYPE => 'STRING', PREPEND => q{;}, SOURCE => $templateModel)
or die "Couldn't construct template: $Text::Template::ERROR";
}
open my $fh, q(>), $opt{'reportfile'} open my $fh, q(>), $opt{'reportfile'}
or die "Unable to open $opt{'reportfile'} in write mode. please check permissions for this file or directory"; or die "Unable to open $opt{'reportfile'} in write mode. please check permissions for this file or directory";
$template->fill_in(HASH =>$vars, OUTPUT=>$fh ); $template->fill_in(HASH =>$vars, OUTPUT=>$fh );