#586 use defaults from reference.conf

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch.io>
eclipse-ditto · May 31, 2021 · bf0dc31 · bf0dc31
1 parent 763cde1
commit bf0dc31
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 43 deletions.
diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
@@ -210,38 +210,38 @@ ditto {
       }
 
       kafka {
-        #consumer = ${akka.kafka.consumer} # resolve defaults from reference.conf # TODO this does not work :/
-        consumer = { # defaults from reference.conf TODO need to find a better way...
-          discovery-method = akka.discovery
-          service-name = ""
-          resolve-timeout = 3 seconds
-          poll-interval = 50ms
-          poll-timeout = 50ms
-          stop-timeout = 30s
-          close-timeout = 20s
-          commit-timeout = 15s
-          commit-time-warning = 1s
-          commit-refresh-interval = infinite
-          use-dispatcher = "akka.kafka.default-dispatcher"
-          wait-close-partition = 500ms
-          position-timeout = 5s
-          offset-for-times-timeout = 5s
-          metadata-request-timeout = 5s
-          eos-draining-check-interval = 30ms
-          partition-handler-warning = 5s
-          connection-checker {
-            enable = false
-            max-retries = 3
-            check-interval = 15s
-            backoff-factor = 2.0
-          }
-
-          offset-reset-protection {
-            enable = false
-            offset-threshold = 9223372036854775807
-            time-threshold = 100000 days
-          }
-        }
+        consumer = ${akka.kafka.consumer} # resolve defaults from reference.conf
+        //        consumer = { # defaults from reference.conf TODO need to find a better way...
+        //          discovery-method = akka.discovery
+        //          service-name = ""
+        //          resolve-timeout = 3 seconds
+        //          poll-interval = 50ms
+        //          poll-timeout = 50ms
+        //          stop-timeout = 30s
+        //          close-timeout = 20s
+        //          commit-timeout = 15s
+        //          commit-time-warning = 1s
+        //          commit-refresh-interval = infinite
+        //          use-dispatcher = "akka.kafka.default-dispatcher"
+        //          wait-close-partition = 500ms
+        //          position-timeout = 5s
+        //          offset-for-times-timeout = 5s
+        //          metadata-request-timeout = 5s
+        //          eos-draining-check-interval = 30ms
+        //          partition-handler-warning = 5s
+        //          connection-checker {
+        //            enable = false
+        //            max-retries = 3
+        //            check-interval = 15s
+        //            backoff-factor = 2.0
+        //          }
+        //
+        //          offset-reset-protection {
+        //            enable = false
+        //            offset-threshold = 9223372036854775807
+        //            time-threshold = 100000 days
+        //          }
+        //        }
         consumer {
           throttling {
             # Interval at which the consumer is throttled. Values smaller than 1s are treated as 1s.
@@ -280,17 +280,17 @@ ditto {
 
         # Properties defined by org.apache.kafka.clients.producer.ProducerConfig
         # can be defined in this configuration section.
-        # producer = ${akka.kafka.producer} # resolve defaults from reference.conf # TODO this does not work :/
-        producer = { # defaults from reference.conf TODO need to find a better way...
-          discovery-method = akka.discovery
-          service-name = ""
-          resolve-timeout = 3 seconds
-          parallelism = 10000
-          close-timeout = 60s
-          close-on-producer-stop = true
-          use-dispatcher = "akka.kafka.default-dispatcher"
-          eos-commit-interval = 100ms
-        }
+        producer = ${akka.kafka.producer} # resolve defaults from reference.conf
+        //        producer = { # defaults from reference.conf TODO need to find a better way...
+        //          discovery-method = akka.discovery
+        //          service-name = ""
+        //          resolve-timeout = 3 seconds
+        //          parallelism = 10000
+        //          close-timeout = 60s
+        //          close-on-producer-stop = true
+        //          use-dispatcher = "akka.kafka.default-dispatcher"
+        //          eos-commit-interval = 100ms
+        //        }
         producer {
           kafka-clients {
             # Close idle connections after the number of milliseconds specified by this config.

diff --git a/...s/config/src/main/java/org/eclipse/ditto/internal/utils/config/raw/RawConfigSupplier.java b/...s/config/src/main/java/org/eclipse/ditto/internal/utils/config/raw/RawConfigSupplier.java
@@ -59,6 +59,7 @@ public Config get() {
         final Config configWithFallbacks = serviceSpecificEnvironmentConfig
                 .withFallback(getServiceSpecificBaseConfig())
                 .withFallback(getCommonDittoServicesConfig())
+                .withFallback(ConfigFactory.load()) // TODO try this on jenkins
                 .resolve();
 
         return ConfigFactory.load(configWithFallbacks);