mirror of https://github.com/mikaku/Monitorix.git
Fix a bug that affected the 'emailreports' module, sending the emails without any graph
This commit is contained in:
parent
d3bd501728
commit
85adefe2bf
|
@ -457,19 +457,24 @@ $cgi{silent} = $silent;
|
||||||
|
|
||||||
if($mode eq "localhost") {
|
if($mode eq "localhost") {
|
||||||
foreach (split(',', $config{graph_name})) {
|
foreach (split(',', $config{graph_name})) {
|
||||||
my $g = trim($_);
|
my $gn = trim($_);
|
||||||
if(lc($config{graph_enable}->{$g}) eq "y") {
|
my $g = "";
|
||||||
my $cgi = $g . "_cgi";
|
if($graph ne "all") {
|
||||||
|
($g) = ($graph =~ m/^_*($gn)\d*$/);
|
||||||
|
next unless $g;
|
||||||
|
}
|
||||||
|
if(lc($config{graph_enable}->{$gn}) eq "y") {
|
||||||
|
my $cgi = $gn . "_cgi";
|
||||||
|
|
||||||
eval "use $g qw(" . $cgi . ")";
|
eval "use $gn qw(" . $cgi . ")";
|
||||||
if($@) {
|
if($@) {
|
||||||
print(STDERR "WARNING: unable to load module '$g. $@'\n");
|
print(STDERR "WARNING: unable to load module '$gn. $@'\n");
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($graph eq "all" || $graph =~ m/^_$g\d+/) {
|
if($graph eq "all" || $gn eq $g) {
|
||||||
no strict "refs";
|
no strict "refs";
|
||||||
&$cgi($g, \%config, \%cgi);
|
&$cgi($gn, \%config, \%cgi);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue