update

tomcat/ADD/ccmd

@@ -6,6 +6,7 @@
 # - /opt/tomcat/logs                             #
 # ENV                                            #
 # - JAVA_OPTS                                    #
+# - CATALINA_OUT                                 #
 ##################################################
 
 set -euo pipefail
@@ -14,6 +15,7 @@ trap Quit EXIT
 
 PIDS=
 GOT_SIGTERM=
+CATALINA_OUT=${CATALINA_OUT:-/dev/null}
 export JAVA_OPTS="-server -Djava.security.egd=file:/dev/./urandom -Duser.timezone=GMT+08 ${JAVA_OPTS:-}"
 
 function Print {
@@ -42,7 +44,7 @@ function RestoreConf {
 
 function StartProc {
     Print Start tomcat ...
-    ./bin/catalina.sh run &> /dev/null &
+    ./bin/catalina.sh run &>> $CATALINA_OUT &
     PIDS="$PIDS $!"
 }
 

tomcat/tomcat.sh

@@ -6,7 +6,6 @@
 
 set -euo pipefail
 export LANG=en_US.UTF-8
-trap Quit EXIT
 
 [ 'x86_64' == "$(uname -m)" ] && ARCH='' || ARCH="-$(uname -m)"
 ROOT_DIR="$(cd $(dirname $0) && pwd)"
@@ -58,6 +57,7 @@ function Build {
 }
 
 function Main {
+    trap Quit EXIT
     Update
     Build
     END=1