diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index 545083dd9148edc3741e214f89d731795f8ca366..d72daea68e71d9c3003d087d2a491339d9b34e91 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 b37a811a4bca4526f65aa36dfa8a512e38f9cda0..6d10c8d7d2130b7daf31acaa80eebc7426d7076c 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)))