X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fbase%2Fsrc%2Ffiles%2Finstall%2Felk%2Finit.d%2Felkd;h=11c6860a26b3965091390bc2bec7983cc89c36fa;hb=ee033842018375e0200a9b8f2e0dc813974440fd;hp=539b4be3eea2bc97312715a1ccb2e1c964f416d3;hpb=87c95be02a8a4d77e165dede90777e811b59dcae;p=policy%2Fengine.git

diff --git a/packages/base/src/files/install/elk/init.d/elkd b/packages/base/src/files/install/elk/init.d/elkd
index 539b4be3e..11c6860a2 100644
--- a/packages/base/src/files/install/elk/init.d/elkd
+++ b/packages/base/src/files/install/elk/init.d/elkd
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ELK_BASE=${POLICY_HOME}/elk/
-ELK_RUNNING="^$JAVA_HOME/bin/java .* -cp.* org.elasticsearch.bootstrap.Elasticsearch$"
+ELK_RUNNING="^$JAVA_HOME/bin/java .* -cp .* org.elasticsearch.bootstrap.Elasticsearch -d$"
 COMPONENT=elk
 
 JMX_JAVA_OPTS="${JMX_JAVA_OPTS} -Dcom.sun.management.jmxremote"
@@ -9,6 +9,8 @@ JMX_JAVA_OPTS="${JMX_JAVA_OPTS} -Dcom.sun.management.jmxremote.port=${{ELK_JMX_P
 JMX_JAVA_OPTS="${JMX_JAVA_OPTS} -Dcom.sun.management.jmxremote.ssl=false" 
 JMX_JAVA_OPTS="${JMX_JAVA_OPTS} -Dcom.sun.management.jmxremote.authenticate=false"
 
+CMD_JAVA_OPTS="${CMD_JAVA_OPTS} -DPOLICY_LOGS=${POLICY_LOGS}"
+
 RETVAL=0
 
 function update_monitor() {
@@ -34,7 +36,7 @@ function stop() {
 }
 
 function start() {
-	export JAVA_OPTS="${JAVA_OPTS} ${JMX_JAVA_OPTS}" 
+	export ES_JAVA_OPTS="${JAVA_OPTS} ${JMX_JAVA_OPTS} ${CMD_JAVA_OPTS}" 
 	$POLICY_HOME/elk/bin/elasticsearch -d
 	RETVAL=$?
 	if [[ ${RETVAL} != 0 ]]; then
@@ -46,6 +48,8 @@ function start() {
 
 # main
 
+. ${POLICY_HOME}/etc/profile.d/env.sh
+
 case "$1" in
     status)
         pid=$(pgrep -f -u ${POLICY_USER} "${ELK_RUNNING}" 2> /dev/null)