From cc5d8c264172178aa4092ea1989e5ef59e649344 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Wed, 10 Apr 2019 02:29:54 +0200
Subject: [PATCH] BUG: find config files for logging
---
.../server/logging/log4j/CustomConfigurationFactory.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/caosdb/server/logging/log4j/CustomConfigurationFactory.java b/src/main/java/caosdb/server/logging/log4j/CustomConfigurationFactory.java
index 0972e1d8..6b7a4569 100644
--- a/src/main/java/caosdb/server/logging/log4j/CustomConfigurationFactory.java
+++ b/src/main/java/caosdb/server/logging/log4j/CustomConfigurationFactory.java
@@ -1,6 +1,5 @@
package caosdb.server.logging.log4j;
-import com.google.common.io.PatternFilenameFilter;
import java.io.File;
import java.net.URI;
import java.util.ArrayList;
@@ -38,12 +37,14 @@ public class CustomConfigurationFactory extends PropertiesConfigurationFactory {
configFiles.add(ext_file.getAbsolutePath());
}
if (ext_dir.exists() && ext_dir.isDirectory()) {
- String[] confFiles = ext_dir.list(new PatternFilenameFilter("\\.properties$"));
+ String[] confFiles = ext_dir.list();
Arrays.sort(confFiles, Comparator.naturalOrder());
for (String fileName : confFiles) {
- configFiles.add(ext_dir.toPath().toAbsolutePath().resolve(fileName).toString());
+ if (fileName.endsWith(".properties"))
+ configFiles.add(ext_dir.toPath().toAbsolutePath().resolve(fileName).toString());
}
}
+ LOGGER.info("Found {} configuration files: {}", configFiles.size(), configFiles);
return configFiles;
}
--
GitLab