Skip to content
Snippets Groups Projects
Commit 74e772ec authored by Daniel's avatar Daniel
Browse files

ENH: Only read *.conf files from conf.d directories.

parent 274ef2df
No related branches found
No related tags found
No related merge requests found
...@@ -150,9 +150,12 @@ public class ServerProperties extends Properties { ...@@ -150,9 +150,12 @@ public class ServerProperties extends Properties {
String[] confFiles = confDir.list(); String[] confFiles = confDir.list();
Arrays.sort(confFiles, Comparator.naturalOrder()); Arrays.sort(confFiles, Comparator.naturalOrder());
for (String confFile : confFiles) { for (String confFile : confFiles) {
// prevent backup files from being read
if (confFiles.endsWith(".conf")) {
loadConfigFile(serverProperties, new File(confDir, confFile)); loadConfigFile(serverProperties, new File(confDir, confFile));
} }
} }
}
// load env vars // load env vars
for (java.util.Map.Entry<String, String> envvar : System.getenv().entrySet()) { for (java.util.Map.Entry<String, String> envvar : System.getenv().entrySet()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment