add library default for some fluency variables to connectivity.conf;

Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
eclipse-ditto · Oct 26, 2021 · 2879c68 · 2879c68
1 parent 90a56bc
commit 2879c68
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...va/org/eclipse/ditto/connectivity/service/config/DefaultFluencyLoggerPublisherConfig.java b/...va/org/eclipse/ditto/connectivity/service/config/DefaultFluencyLoggerPublisherConfig.java
@@ -91,6 +91,7 @@ public static FluencyLoggerPublisherConfig of(final Config config) {
     @Override
     public Fluency buildFluencyLoggerPublisher() {
         final FluencyBuilderForFluentd fluencyBuilderForFluentd = new FluencyBuilderForFluentd();
+
         fluencyBuilderForFluentd.setSslEnabled(sslEnabled);
         fluencyBuilderForFluentd.setConnectionTimeoutMilli((int) connectionTimeout.toMillis());
         fluencyBuilderForFluentd.setReadTimeoutMilli((int) readTimeout.toMillis());
@@ -107,6 +108,7 @@ public Fluency buildFluencyLoggerPublisher() {
         fluencyBuilderForFluentd.setSenderBaseRetryIntervalMillis((int) senderBaseRetryInterval.toMillis());
         fluencyBuilderForFluentd.setSenderMaxRetryIntervalMillis((int) senderMaxRetryInterval.toMillis());
         fluencyBuilderForFluentd.setAckResponseMode(ackResponseMode);
+
         return fluencyBuilderForFluentd.build(host, port);
     }
 
@@ -168,4 +170,5 @@ public String toString() {
                 ", ackResponseMode=" + ackResponseMode +
                 "]";
     }
+
 }
diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
@@ -704,7 +704,7 @@ ditto {
 
             # for file backup mode:
             # "In this mode, Fluency takes backup of unsent memory buffers as files when closing and then resends them when restarting"
-            fileBackupDir = null          # library default: null
+            fileBackupDir = null                # library default: null
 
             ## ExponentialBackOffRetryStrategy.Config
 
@@ -713,16 +713,16 @@ ditto {
             ## RetryStrategy.Config
 
             # retry base interval:
-            senderBaseRetryInterval = 400ms  # min: 10ms
+            senderBaseRetryInterval = 400ms  # min: 10ms library default: 400ms
 
             # retry max interval:
-            senderMaxRetryInterval = 30s     # min: 10ms
+            senderMaxRetryInterval = 30s     # min: 10ms library default: 30s
 
             ## FluentdIngester.Config
 
             # whether ACK response mode is enabled, meaning that it is waited for the ACK of the fluentd/fluentbit
             # instance where the logs are published to. Enables "at-least-once" semantics:
-            ackResponseMode = false
+            ackResponseMode = false         # library default: false
           }
         }
       }