This is an automated email from the ASF dual-hosted git repository.
rmerriman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metron.git
The following commit(s) were added to refs/heads/master by this push:
new 57bbab2 METRON-2106 Escalation topic setting in Ambari has no effect
(merrimanr) closes apache/metron#1400
57bbab2 is described below
commit 57bbab2c899877ddb114082bff111444b3089b00
Author: merrimanr <[email protected]>
AuthorDate: Mon May 13 15:57:13 2019 -0500
METRON-2106 Escalation topic setting in Ambari has no effect (merrimanr)
closes apache/metron#1400
---
metron-interface/metron-rest/src/main/scripts/metron-rest.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/metron-interface/metron-rest/src/main/scripts/metron-rest.sh
b/metron-interface/metron-rest/src/main/scripts/metron-rest.sh
index 6f07925..19d0a33 100644
--- a/metron-interface/metron-rest/src/main/scripts/metron-rest.sh
+++ b/metron-interface/metron-rest/src/main/scripts/metron-rest.sh
@@ -83,7 +83,7 @@ echo
"METRON_SPRING_PROFILES_ACTIVE=${METRON_SPRING_PROFILES_ACTIVE}"
# the vagrant Spring profile provides configuration values, otherwise
configuration is provided by rest_application.yml
if [[ !(${METRON_SPRING_PROFILES_ACTIVE} == *"vagrant"*) ]]; then
- METRON_CONFIG_LOCATION="
--spring.config.location=$METRON_HOME/config/rest_application.yml,classpath:/application.yml"
+ METRON_CONFIG_LOCATION="
--spring.config.additional-location=file:$METRON_HOME/config/rest_application.yml"
echo "METRON_CONFIG_LOCATION=${METRON_CONFIG_LOCATION}"
METRON_SPRING_OPTIONS+=${METRON_CONFIG_LOCATION}
fi
