diff options
author | Carsten Lund <lund@research.att.com> | 2017-04-16 14:00:29 +0000 |
---|---|---|
committer | Carsten Lund <lund@research.att.com> | 2017-04-16 14:01:24 +0000 |
commit | 3ec1de0d0dc87b0123dd0ec47b3c9f40f22bad24 (patch) | |
tree | 033b72ee193ffa31e701f8fc14fa0968428d2b8f /ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller | |
parent | a3e9b9cea143816780eed14896ca5843402ee371 (diff) |
[DCAE-15] Changes related to version 1.1
See Jira for details
Change-Id: I392c4faf0de70d7a810f86eaafb7ed3ab4613386
Signed-off-by: Carsten Lund <lund@research.att.com>
Diffstat (limited to 'ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller')
-rw-r--r-- | ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller b/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller index 86a0713..b6708e7 100644 --- a/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller +++ b/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller @@ -63,22 +63,24 @@ CMD=$1 shift check_status + +CP=$(find $_DIR/lib/*/* -name \*.jar 2>/dev/null | xargs -I X printf ":%s" X) + +JVMARGS=$(grep 'server.jvmargs' $_DIR/config/monitoring.properties | sed -e 's/.*=//') + case $CMD in status) echo $_STATUS exit 0 ;; console) - CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X) - $GROOVY_HOME/bin/groovysh -cp $_DIR/config:$_DIR/lib:$CP + $GROOVY_HOME/bin/groovysh -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP ;; run) - CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X) - $JAVA_HOME/bin/java -cp $_DIR/config:$_DIR/lib:$CP "$@" + $JAVA_HOME/bin/java -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" ;; groovy) - CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X) - $GROOVY_HOME/bin/groovy -cp $_DIR/config:$_DIR/lib:$CP "$@" + $GROOVY_HOME/bin/groovy -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" ;; start) if [ "$_RUNNING" = "1" ]; then @@ -90,9 +92,8 @@ case $CMD in if [ -e $_DIR/logs/$PNAME.err.1 ]; then mv $_DIR/logs/$PNAME.err.1 $_DIR/logs/$PNAME.err.2; fi if [ -e $_DIR/logs/$PNAME.out ]; then mv $_DIR/logs/$PNAME.out $_DIR/logs/$PNAME.out.1; fi if [ -e $_DIR/logs/$PNAME.err ]; then mv $_DIR/logs/$PNAME.err $_DIR/logs/$PNAME.err.1; fi - CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X) - nohup $JAVA_HOME/bin/java -cp $_DIR/config:$_DIR/lib:$CP "$@" $CLASS > $_DIR/logs/$PNAME.out 2> $_DIR/logs/$PNAME.err & + nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" $CLASS >> $_DIR/logs/$PNAME.out 2>> $_DIR/logs/$PNAME.err & _PID=$! echo $_PID > $_PIDFILE |