Merge "Added William Reehil as committer"

[aai/search-data-service.git] / search-data-service-app / src / main / bin / start.sh

diff --git a/search-data-service-app/src/main/bin/start.sh b/search-data-service-app/src/main/bin/start.sh
index 7f81ee9..c430b0d 100644 (file)
--- a/search-data-service-app/src/main/bin/start.sh
+++ b/search-data-service-app/src/main/bin/start.sh
@@ -14,32 +14,9 @@ if [ -z "$KEY_STORE_PASSWORD" ]; then
        exit 1
 fi
 
-# Changes related to:AAI-2179
-# Change aai search-data  container processes to run as non-root on the host
-USER_ID=${LOCAL_USER_ID:-9001}
-GROUP_ID=${LOCAL_GROUP_ID:-9001}
-SD_LOGS=/var/log/onap/AAI-SDB
-
-if [ $(cat /etc/passwd | grep aaiadmin | wc -l) -eq 0 ]; then
-
-        groupadd aaiadmin -g ${GROUP_ID} || {
-                echo "Unable to create the group id for ${GROUP_ID}";
-                exit 1;
-        }
-        useradd --shell=/bin/bash -u ${USER_ID} -g ${GROUP_ID} -o -c "" -m aaiadmin || {
-                echo "Unable to create the user id for ${USER_ID}";
-                exit 1;
-        }
-fi;
-
-chown -R aaiadmin:aaiadmin ${MICRO_HOME}
-chown -R aaiadmin:aaiadmin ${AJSC_HOME}
-chown -R aaiadmin:aaiadmin ${SD_LOGS}
-
 find ${MICRO_HOME}  -name "*.sh" -exec chmod +x {} +
 
-gosu aaiadmin ln -s /logs $MICRO_HOME/logs
-JAVA_CMD="exec gosu aaiadmin java";
+JAVA_CMD="exec java";
 ###
 PROPS="-DAJSC_HOME=$AJSC_HOME"
 PROPS="$PROPS -DAJSC_CONF_HOME=$AJSC_CONF_HOME"
@@ -56,5 +33,6 @@ if [ ! -z "$TRUST_STORE_LOCATION" ]; then
 fi
 
 JVM_MAX_HEAP=${MAX_HEAP:-1024}
+JVM_MIN_HEAP=${JVM_MAX_HEAP}
 
-${JAVA_CMD}   $PROPS -jar $BASEDIR/search-data-service-package.jar
+${JAVA_CMD} -Xms${JVM_MIN_HEAP}m -Xmx${JVM_MAX_HEAP}m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/onap $PROPS -jar $BASEDIR/search-data-service-package.jar