From c4098a3af4794da9a1516760baa2318fb91ae258 Mon Sep 17 00:00:00 2001 From: vagrant Date: Tue, 28 Nov 2017 13:36:38 +0000 Subject: code syncup with ECOMP updates Issue-ID: DCAEGEN2-212 Change-Id: Id388f26be57d2a12250a6845ed5678d0cebceed6 Signed-off-by: Vijay Venkatesh Kumar --- src/main/scripts/VESrestfulCollector.sh | 3 ++- src/main/scripts/docker-entry.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/scripts') diff --git a/src/main/scripts/VESrestfulCollector.sh b/src/main/scripts/VESrestfulCollector.sh index fc6cd22f..45bdc6ef 100644 --- a/src/main/scripts/VESrestfulCollector.sh +++ b/src/main/scripts/VESrestfulCollector.sh @@ -46,7 +46,8 @@ collector_start() { # for all the jars. #cd /opt/app/VESCollector/ cd ${BASEDIR} - nohup $JAVA -cp "etc${PATHSEP}lib/*" $JAVA_OPTS -Dhttps.protocols=TLSv1.1,TLSv1.2 $MAINCLASS $* & + #nohup $JAVA -cp "etc${PATHSEP}lib/*" $JAVA_OPTS -Dhttps.protocols=TLSv1.1,TLSv1.2 $MAINCLASS $* & + nohup $JAVA -cp "etc${PATHSEP}lib/*" -Xms256m -Xmx512m -XX:ErrorFile=/opt/app/VESCollector/logs/java_error%p.log -XX:+HeapDumpOnOutOfMemoryError -Dhttps.protocols=TLSv1.1,TLSv1.2 $MAINCLASS $* & if [ $? -ne 0 ]; then echo "VES Restful Collector has been started!!!" | tee -a ${BASEDIR}/logs/console.txt fi diff --git a/src/main/scripts/docker-entry.sh b/src/main/scripts/docker-entry.sh index 34cbe4cb..26dcb896 100644 --- a/src/main/scripts/docker-entry.sh +++ b/src/main/scripts/docker-entry.sh @@ -31,6 +31,8 @@ fi if [ -z "$CONSUL_HOST" ] || [ -z "$CONFIG_BINDING_SERVICE" ] || [ -z "$HOSTNAME" ]; then echo "INFO: USING STANDARD ALONE CONFIGURATION SETUP" + ## For Container supporting both classic and GEN2 controller - below line should be uncommented, provided service manager package is included + #/opt/app/manager/start-manager.sh else echo "INFO: USING DCAEGEN2 CONTROLLER" fi -- cgit 1.2.3-korg