Skip to content
Snippets Groups Projects
Unverified Commit cc5d8c26 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

BUG: find config files for logging

parent 07967435
No related branches found
No related tags found
No related merge requests found
package caosdb.server.logging.log4j; package caosdb.server.logging.log4j;
import com.google.common.io.PatternFilenameFilter;
import java.io.File; import java.io.File;
import java.net.URI; import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -38,12 +37,14 @@ public class CustomConfigurationFactory extends PropertiesConfigurationFactory { ...@@ -38,12 +37,14 @@ public class CustomConfigurationFactory extends PropertiesConfigurationFactory {
configFiles.add(ext_file.getAbsolutePath()); configFiles.add(ext_file.getAbsolutePath());
} }
if (ext_dir.exists() && ext_dir.isDirectory()) { 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()); Arrays.sort(confFiles, Comparator.naturalOrder());
for (String fileName : confFiles) { 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; return configFiles;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment