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

avoid error messages if 'include_dir' option is not present

This commit is contained in:
Jordi Sanfeliu 2014-03-18 09:03:02 +01:00
parent 6871a49f07
commit 512dc644ec
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monitorix
View File

@ -442,7 +442,7 @@ if($options{d}) {
} }
# load additional configuration files # load additional configuration files
if(opendir(DIR, $config{include_dir})) { if($config{include_dir} && 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) {
@ -488,7 +488,8 @@ if(opendir(DIR, $config{include_dir})) {
@config{keys %config_inc} = values %config_inc; @config{keys %config_inc} = values %config_inc;
} }
} else { } else {
logger("Can't read directory '$config{include_dir}'. $!"); logger("Can't read directory '$config{include_dir}'. $!")
if $config{include_dir};
} }
# save the path of the configuration file # save the path of the configuration file

2
monitorix.cgi
View File

@ -217,7 +217,7 @@ my $conf = new Config::General(
%config = $conf->getall; %config = $conf->getall;
# load additional configuration files # load additional configuration files
if(opendir(DIR, $config{include_dir})) { if($config{include_dir} && 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) {