From 32f13fb728e3e382180f29613ff086e3d35ddaaf Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@fhi-berlin.mpg.de>
Date: Mon, 23 Jul 2018 00:49:46 +0200
Subject: [PATCH] improve printout of config (hide overrides)
---
core/src/main/resources/reference.conf | 6 +++++-
core/src/main/scala/eu/nomad_lab/LocalEnv.scala | 6 +++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf
index 545083dd..d72daea6 100644
--- a/core/src/main/resources/reference.conf
+++ b/core/src/main/resources/reference.conf
@@ -210,7 +210,7 @@ nomad_lab {
}
}
}
-
+overrides{
default.nomad_lab {
normalizers.trace = true
processorBackend.trace = true
@@ -288,6 +288,9 @@ labdev.nomad_lab {
rootNamespace = "prod-${coreVersion}"
}
toNormalize.archiveSet.baseDirectory = "${normalizedRoot}/${rootNamespace}"
+ calculation_info_normalizer {
+ pidEndpoint = "http://staging-nomad.esc.rzg.mpg.de:8111/repo/utility/pids?gid=\"${archiveGid}\""
+ }
parsing_stats {
enabled = false
username = parsing_stats
@@ -389,3 +392,4 @@ kubernetes_dev.nomad_lab {
}
}
}
+}
\ No newline at end of file
diff --git a/core/src/main/scala/eu/nomad_lab/LocalEnv.scala b/core/src/main/scala/eu/nomad_lab/LocalEnv.scala
index b37a811a..6d10c8d7 100644
--- a/core/src/main/scala/eu/nomad_lab/LocalEnv.scala
+++ b/core/src/main/scala/eu/nomad_lab/LocalEnv.scala
@@ -114,18 +114,18 @@ object LocalEnv extends StrictLogging {
}
val mergedConfig = consoleConfig.withFallback(applicationConfig).withFallback(refConfig)
val configToUseNow = configToUse.getOrElse(mergedConfig.getString("nomad_lab.configurationToUse"))
- val finalConfig: Config = if (configToUseNow == null || configToUseNow == "") {
+ val finalConfig: Config = (if (configToUseNow == null || configToUseNow == "") {
mergedConfig
} else {
try {
- mergedConfig.getConfig(configToUseNow).withFallback(mergedConfig)
+ mergedConfig.getConfig("overrides").getConfig(configToUseNow).withFallback(mergedConfig)
} catch {
case ex: Missing =>
if (verbose)
logger.warn(s"Configuration $configToUse has no overrides.")
mergedConfig
}
- }
+ }).withoutPath("overrides")
if (verbose) {
logger.info(s"Loaded configuration '$configToUseNow' using $configDescription")
logger.info(finalConfig.root().render(com.typesafe.config.ConfigRenderOptions.defaults().setOriginComments(false).setComments(false)))
--
GitLab