mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make sure to load only .conf files

This commit is contained in:
Jordi Sanfeliu 2014-03-11 11:18:58 +01:00
parent 8a2a7eebba
commit a7f5bff2bb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monitorix
View File

@ -446,13 +446,15 @@ if(opendir(DIR, $config{include_dir})) {
my @files = grep { !/^[.]/ } readdir(DIR); my @files = grep { !/^[.]/ } readdir(DIR);
close(DIR); close(DIR);
foreach my $c (sort @files) { foreach my $c (sort @files) {
next unless -f $config{include_dir} . "/$c";
next unless $c =~ m/\.conf$/;
my $conf_inc = new Config::General( my $conf_inc = new Config::General(
-ConfigFile => $config{include_dir} . "/$c", -ConfigFile => $config{include_dir} . "/$c",
); );
my %config_inc = $conf_inc->getall; my %config_inc = $conf_inc->getall;
my $g = $config_inc{graph_name}; my $g = $config_inc{graph_name};
if(!$g) { if(!$g) {
logger("ERROR: graph name not defined."); logger("ERROR: graph name not defined in '$c'.");
next; next;
} }
if(grep {trim($_) eq $g} (split(',', $config{graph_name}))) { if(grep {trim($_) eq $g} (split(',', $config{graph_name}))) {

2
monitorix.cgi
View File

@ -221,6 +221,8 @@ if(opendir(DIR, $config{include_dir})) {
my @files = grep { !/^[.]/ } readdir(DIR); my @files = grep { !/^[.]/ } readdir(DIR);
close(DIR); close(DIR);
foreach my $c (sort @files) { foreach my $c (sort @files) {
next unless -f $config{include_dir} . "/$c";
next unless $c =~ m/\.conf$/;
my $conf_inc = new Config::General( my $conf_inc = new Config::General(
-ConfigFile => $config{include_dir} . "/$c", -ConfigFile => $config{include_dir} . "/$c",
); );