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

WIP: String IDs

parent fad8718d
Branches
Tags
2 merge requests!105Release 0.11.0,!78External IDs
Pipeline #41732 failed
...@@ -154,6 +154,7 @@ public class CaosDBServer extends Application { ...@@ -154,6 +154,7 @@ public class CaosDBServer extends Application {
parseArguments(args); parseArguments(args);
initScheduler(); initScheduler();
initServerProperties(); initServerProperties();
initCaching();
initTimeZone(); initTimeZone();
initOneTimeTokens(); initOneTimeTokens();
initShiro(); initShiro();
...@@ -197,6 +198,9 @@ public class CaosDBServer extends Application { ...@@ -197,6 +198,9 @@ public class CaosDBServer extends Application {
public static void initServerProperties() throws IOException { public static void initServerProperties() throws IOException {
SERVER_PROPERTIES = ServerProperties.initServerProperties(); SERVER_PROPERTIES = ServerProperties.initServerProperties();
}
public static void initCaching() {
USE_CACHE = USE_CACHE =
!Boolean.parseBoolean(CaosDBServer.getServerProperty(ServerProperties.KEY_CACHE_DISABLE)); !Boolean.parseBoolean(CaosDBServer.getServerProperty(ServerProperties.KEY_CACHE_DISABLE));
} }
......
...@@ -17,6 +17,7 @@ public class TestCaching { ...@@ -17,6 +17,7 @@ public class TestCaching {
@BeforeAll @BeforeAll
public static void init() throws IOException { public static void init() throws IOException {
CaosDBServer.initServerProperties(); CaosDBServer.initServerProperties();
CaosDBServer.initCaching();
JCSCacheHelper.init(); JCSCacheHelper.init();
} }
......
...@@ -17,6 +17,7 @@ public class TestNoCaching { ...@@ -17,6 +17,7 @@ public class TestNoCaching {
public static void init() throws IOException { public static void init() throws IOException {
CaosDBServer.initServerProperties(); CaosDBServer.initServerProperties();
CaosDBServer.setProperty(ServerProperties.KEY_CACHE_DISABLE, "TRUE"); CaosDBServer.setProperty(ServerProperties.KEY_CACHE_DISABLE, "TRUE");
CaosDBServer.initCaching();
JCSCacheHelper.init(); JCSCacheHelper.init();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment