From 74e772ec60119f8e05d14a9fd42a8caf51c5f74e Mon Sep 17 00:00:00 2001
From: Daniel <daniel@harvey>
Date: Fri, 29 Mar 2019 11:48:56 +0100
Subject: [PATCH] ENH: Only read *.conf files from conf.d directories.
---
src/main/java/caosdb/server/ServerProperties.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/caosdb/server/ServerProperties.java b/src/main/java/caosdb/server/ServerProperties.java
index 701f22c8..74c421f8 100644
--- a/src/main/java/caosdb/server/ServerProperties.java
+++ b/src/main/java/caosdb/server/ServerProperties.java
@@ -150,7 +150,10 @@ public class ServerProperties extends Properties {
String[] confFiles = confDir.list();
Arrays.sort(confFiles, Comparator.naturalOrder());
for (String confFile : confFiles) {
- loadConfigFile(serverProperties, new File(confDir, confFile));
+ // prevent backup files from being read
+ if (confFiles.endsWith(".conf")) {
+ loadConfigFile(serverProperties, new File(confDir, confFile));
+ }
}
}
--
GitLab