put stop server marker file in /tmp, put stop server out file in ../servers/<server-name>/logs

Author: pfmackin

operator/src/main/resources/scripts/startServer.sh

@@ -111,7 +111,7 @@ function waitForShutdownMarker() {
   #
   trace "Wait indefinitely so that the Kubernetes pod does not exit and try to restart"
   while true; do
-    if [ -e ${DOMAIN_HOME}/doShutdown ] ; then
+    if [ -e /tmp/doShutdown ] ; then
       exit 0
     fi
     sleep 3

operator/src/main/resources/scripts/stopServer.sh

@@ -13,7 +13,7 @@ SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 source ${SCRIPTPATH}/traceUtils.sh
 [ $? -ne 0 ] && echo "Error: missing file ${SCRIPTPATH}/traceUtils.sh" && exit 1
 
-trace "Stop server ${SERVER_NAME}" &>> /weblogic-operator/stopserver.out
+trace "Stop server ${SERVER_NAME}" &>> ${SERVER_OUT_FILE}
 
 checkEnv SERVER_NAME || exit 1
 
@@ -28,27 +28,31 @@ function check_for_shutdown() {
   state=`${SCRIPTPATH}/readState.sh`
   exit_status=$?
   if [ $exit_status -ne 0 ]; then
-    trace "Node manager not running or server instance not found; assuming shutdown" &>> /weblogic-operator/stopserver.out
+    trace "Node manager not running or server instance not found; assuming shutdown" &>> ${SERVER_OUT_FILE}
     return 0
   fi
 
   if [ "$state" = "SHUTDOWN" ]; then
-    trace "Server is shutdown" &>> /weblogic-operator/stopserver.out
+    trace "Server is shutdown" &>> ${SERVER_OUT_FILE}
     return 0
   fi
 
   if [[ "$state" =~ ^FAILED ]]; then
-    trace "Server in failed state" &>> /weblogic-operator/stopserver.out
+    trace "Server in failed state" &>> ${SERVER_OUT_FILE}
     return 0
   fi
 
-  trace "Server is currently in state $state" &>> /weblogic-operator/stopserver.out
+  trace "Server is currently in state $state" &>> ${SERVER_OUT_FILE}
   return 1
 }
 
+# setup ".out" location for a WL server
+serverLogHome="${LOG_HOME:-${DOMAIN_HOME}/servers/${SERVER_NAME}/logs}"
+SERVER_OUT_FILE="${serverLogHome}/stop-${SERVER_NAME}.out"
+
 # Check if the server is already shutdown
 check_for_shutdown
-[ $? -eq 0 ] && trace "Server already shutdown or failed" &>> /weblogic-operator/stopserver.out && exit 0
+[ $? -eq 0 ] && trace "Server already shutdown or failed" &>>  ${SERVER_OUT_FILE} && exit 0
 
 # Otherwise, connect to the node manager and stop the server instance
 [ ! -f "${SCRIPTPATH}/wlst.sh" ] && trace "Error: missing file '${SCRIPTPATH}/wlst.sh'." && exit 1
@@ -60,23 +64,23 @@ export SHUTDOWN_TIMEOUT_ARG=${SHUTDOWN_TIMEOUT:-30}
 export SHUTDOWN_IGNORE_SESSIONS_ARG=${SHUTDOWN_IGNORE_SESSIONS:-false}
 export SHUTDOWN_TYPE_ARG=${SHUTDOWN_TYPE:-Graceful}
 
-trace "Before stop-server.py [${SERVER_NAME}] ${SCRIPTDIR}" &>> /weblogic-operator/stopserver.out
-${SCRIPTPATH}/wlst.sh /weblogic-operator/scripts/stop-server.py &>> /weblogic-operator/stopserver.out
-trace "After stop-server.py" &>> /weblogic-operator/stopserver.out
+trace "Before stop-server.py [${SERVER_NAME}] ${SCRIPTDIR}" &>> ${SERVER_OUT_FILE}
+${SCRIPTPATH}/wlst.sh /weblogic-operator/scripts/stop-server.py &>> ${SERVER_OUT_FILE}
+trace "After stop-server.py" &>> ${SERVER_OUT_FILE}
 
 # at this point node manager should have terminated the server
 # but let's try looking for the server process and
 # kill the server if the process still exists,
 # just in case we failed to stop it via wlst
 pid=$(jps -v | grep " -Dweblogic.Name=${SERVER_NAME} " | awk '{print $1}')
 if [ ! -z $pid ]; then
-  echo "Killing the server process $pid" &>> /weblogic-operator/stopserver.out
+  echo "Killing the server process $pid" &>> ${SERVER_OUT_FILE}
   kill -15 $pid
 fi
 
-touch ${DOMAIN_HOME}/doShutdown
+touch /tmp/doShutdown
 if [ -f /weblogic-operator/pid ]; then
   kill -2 $(</weblogic-operator/pid)
 fi
 
-trace "Exit script"  &>> /weblogic-operator/stopserver.out
+trace "Exit script"  &>> ${SERVER_OUT_FILE}