From 198d97e1161f84493c5699a05591907855c3e099 Mon Sep 17 00:00:00 2001 From: kukgini Date: Wed, 11 Nov 2015 11:45:46 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=8B=A4=ED=96=89=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=EA=B0=80=20=ED=94=84=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EB=9E=A8=EC=9D=B4=20=EC=84=A4=EC=B9=98=EB=90=9C=20=EC=A0=88?= =?UTF-8?q?=EB=8C=80=EA=B2=BD=EB=A1=9C=EB=A5=BC=20=EA=B8=B0=EB=B0=98?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=8F=99=EC=9E=91=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B0=9C=EC=84=A0;=20=EB=94=94=EB=A0=89=ED=84=B0?= =?UTF-8?q?=EB=A6=AC=EB=AA=85=EC=97=90=20=EA=B3=B5=EB=B0=B1=EC=9D=B4=20?= =?UTF-8?q?=ED=8F=AC=ED=95=A8=EB=90=98=EC=96=B4=EB=8F=84=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=EA=B0=80=20=EB=82=98=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scouter.server/scripts/env.sh | 7 +++++++ scouter.server/scripts/readlink.sh | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 scouter.server/scripts/env.sh create mode 100755 scouter.server/scripts/readlink.sh diff --git a/scouter.server/scripts/env.sh b/scouter.server/scripts/env.sh new file mode 100644 index 000000000..6673fca9a --- /dev/null +++ b/scouter.server/scripts/env.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +READLINK="`dirname $0`/readlink.sh" +TUNAHOME="`dirname $($READLINK $0/..)`" + +JAVAOPTS="-Xmx512m" + diff --git a/scouter.server/scripts/readlink.sh b/scouter.server/scripts/readlink.sh new file mode 100755 index 000000000..3e31fd345 --- /dev/null +++ b/scouter.server/scripts/readlink.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +TARGET_FILE=$1 + +cd `dirname $TARGET_FILE` +TARGET_FILE=`basename $TARGET_FILE` + +# Iterate down a (possible) chain of symlinks +while [ -L "$TARGET_FILE" ] +do + TARGET_FILE=`readlink $TARGET_FILE` + cd `dirname $TARGET_FILE` + TARGET_FILE=`basename $TARGET_FILE` +done + +# Compute the canonicalized name by finding the physical path +# for the directory we're in and appending the target file. +PHYS_DIR=`pwd -P` +RESULT=$PHYS_DIR/$TARGET_FILE +echo $RESULT From d7921d0823c4e0eee9d07327cb79762bdabeee0e Mon Sep 17 00:00:00 2001 From: kukgini Date: Wed, 11 Nov 2015 11:47:47 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=8B=A4=ED=96=89=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=EA=B0=80=20=ED=94=84=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EB=9E=A8=EC=9D=B4=20=EC=84=A4=EC=B9=98=EB=90=9C=20=EC=A0=88?= =?UTF-8?q?=EB=8C=80=EA=B2=BD=EB=A1=9C=EB=A5=BC=20=EA=B8=B0=EB=B0=98?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=8F=99=EC=9E=91=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B0=9C=EC=84=A0;=20=EB=94=94=EB=A0=89=ED=84=B0?= =?UTF-8?q?=EB=A6=AC=EB=AA=85=EC=97=90=20=EA=B3=B5=EB=B0=B1=EC=9D=B4=20?= =?UTF-8?q?=ED=8F=AC=ED=95=A8=EB=90=98=EC=96=B4=EB=8F=84=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=EA=B0=80=20=EB=82=98=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scouter.server/scripts/startcon.sh | 6 +++++- scouter.server/scripts/startup.sh | 11 ++++++++--- scouter.server/scripts/stop.sh | 6 +++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/scouter.server/scripts/startcon.sh b/scouter.server/scripts/startcon.sh index f0472d5b8..7db9ccabd 100644 --- a/scouter.server/scripts/startcon.sh +++ b/scouter.server/scripts/startcon.sh @@ -1 +1,5 @@ -java -Xmx512m -classpath ./boot.jar scouter.boot.Boot ./lib -console \ No newline at end of file +#!/usr/bin/env bash + +. $(dirname $0)/env.sh + +java -Xmx512m -classpath "$TUNAHOME/boot.jar" scouter.boot.Boot "$TUNAHOME/lib" -console diff --git a/scouter.server/scripts/startup.sh b/scouter.server/scripts/startup.sh index 2fe15e5b3..d40a1b57c 100644 --- a/scouter.server/scripts/startup.sh +++ b/scouter.server/scripts/startup.sh @@ -1,5 +1,10 @@ -mkdir logs > /dev/null 2>&1 -cp nohup.out ./logs/nohup.$(date '+%Y%m%d%H%M%S').out > /dev/null 2>&1 -nohup java -Xmx512m -classpath ./boot.jar scouter.boot.Boot ./lib > nohup.out & +#!/usr/bin/env bash + +. $(dirname $0)/env.sh + +mkdir -p $TUNAHOME/logs > /dev/null 2>&1 +cp nohup.out "$TUNAHOME/logs/nohup.$(date '+%Y%m%d%H%M%S').out" > /dev/null 2>&1 +nohup java $JAVAOPTS -classpath "$TUNAHOME/boot.jar" scouter.boot.Boot "$TUNAHOME/lib" > nohup.out & + echo "Scouter server launching..." echo "See the nohup.out." diff --git a/scouter.server/scripts/stop.sh b/scouter.server/scripts/stop.sh index 0e0cf0bab..c8fd19e9d 100644 --- a/scouter.server/scripts/stop.sh +++ b/scouter.server/scripts/stop.sh @@ -1 +1,5 @@ -rm -f *.scouter \ No newline at end of file +#!/usr/bin/env bash + +. $(dirname $0)/env.sh + +rm -f "$TUNAHOME/*.scouter" From 1f6046b4b36d71800d5687f08b56e4a5c0b513e7 Mon Sep 17 00:00:00 2001 From: kukgini Date: Wed, 11 Nov 2015 11:50:05 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=8B=A4=ED=96=89=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=EA=B0=80=20=ED=94=84=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EB=9E=A8=EC=9D=B4=20=EC=84=A4=EC=B9=98=EB=90=9C=20=EC=A0=88?= =?UTF-8?q?=EB=8C=80=EA=B2=BD=EB=A1=9C=EB=A5=BC=20=EA=B8=B0=EB=B0=98?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=8F=99=EC=9E=91=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B0=9C=EC=84=A0;=20=EB=94=94=EB=A0=89=ED=84=B0?= =?UTF-8?q?=EB=A6=AC=EB=AA=85=EC=97=90=20=EA=B3=B5=EB=B0=B1=EC=9D=B4=20?= =?UTF-8?q?=ED=8F=AC=ED=95=A8=EB=90=98=EC=96=B4=EB=8F=84=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=EA=B0=80=20=EB=82=98=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scouter.server/scripts/startup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scouter.server/scripts/startup.sh b/scouter.server/scripts/startup.sh index d40a1b57c..0531ae98f 100644 --- a/scouter.server/scripts/startup.sh +++ b/scouter.server/scripts/startup.sh @@ -2,7 +2,7 @@ . $(dirname $0)/env.sh -mkdir -p $TUNAHOME/logs > /dev/null 2>&1 +mkdir -p "$TUNAHOME/logs" > /dev/null 2>&1 cp nohup.out "$TUNAHOME/logs/nohup.$(date '+%Y%m%d%H%M%S').out" > /dev/null 2>&1 nohup java $JAVAOPTS -classpath "$TUNAHOME/boot.jar" scouter.boot.Boot "$TUNAHOME/lib" > nohup.out &