OAK-9600 - Make standby.secure configurable

apache · Oct 19, 2021 · 1e9cefb · 1e9cefb
1 parent 3f4c92b
commit 1e9cefb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java b/...ar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
@@ -91,7 +91,7 @@ public class StandbyStoreService {
             name = "Sync interval (seconds)",
             description = "Sync interval in seconds (standby mode only)"
         )
-        int interval() default 5;
+        long interval() default 5;
 
         @AttributeDefinition(
             name = "Allowed IP-Ranges",
@@ -198,7 +198,7 @@ private void bootstrapPrimary(Configuration config, FileStore fileStore) {
             .withFileStore(fileStore)
             .withBlobChunkSize(BLOB_CHUNK_SIZE)
             .withAllowedClientIPRanges(ranges)
-            .withSecureConnection(true)
+            .withSecureConnection(secure)
             .withSSLKeyFile(sslKeyFile)
             .withSSLChainFile(sslChainFile)
             .withSSLClientValidation(sslValidateClient)

diff --git a/...ent-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java b/...ent-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java
@@ -50,7 +50,7 @@ public void testComponentDescriptor() throws Exception {
             .withValue("127.0.0.1")
             .check());
         assertTrue(cd.hasProperty("interval")
-            .withIntegerType()
+            .withLongType()
             .withValue("5")
             .check());
         assertTrue(cd.hasProperty("secure")
@@ -101,7 +101,7 @@ public void testMetatypeInformation() throws Exception {
             .withDefaultValue("127.0.0.1")
             .check());
         assertTrue(ocd.hasAttributeDefinition("interval")
-            .withIntegerType()
+            .withLongType()
             .withDefaultValue("5")
             .check());
         assertTrue(ocd.hasAttributeDefinition("secure")