avoid error messages if 'include_dir' option is not present

mikaku · Mar 18, 2014 · 512dc64 · 512dc64
1 parent 6871a49
commit 512dc64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/monitorix b/monitorix
@@ -442,7 +442,7 @@ if($options{d}) {
 }
 
 # load additional configuration files
-if(opendir(DIR, $config{include_dir})) {
+if($config{include_dir} && opendir(DIR, $config{include_dir})) {
 	my @files = grep { !/^[.]/ } readdir(DIR);
 	close(DIR);
 	foreach my $c (sort @files) {
@@ -488,7 +488,8 @@ if(opendir(DIR, $config{include_dir})) {
 		@config{keys %config_inc} = values %config_inc;
 	}
 } 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

diff --git a/monitorix.cgi b/monitorix.cgi
@@ -217,7 +217,7 @@ my $conf = new Config::General(
 %config = $conf->getall;
 
 # load additional configuration files
-if(opendir(DIR, $config{include_dir})) {
+if($config{include_dir} && opendir(DIR, $config{include_dir})) {
 	my @files = grep { !/^[.]/ } readdir(DIR);
 	close(DIR);
 	foreach my $c (sort @files) {