move server log monitoring to a new script monitorLog.sh

Author: alai8

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

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Copyright 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at
+# http://oss.oracle.com/licenses/upl.
+
+#
+# This script is used to monitor the server log until the server is
+# started successfully.
+# It is separate from startServer.sh so that it is easier to quickly 
+# kill the process running this script.
+#
+
+echo $$ > /tmp/monitorLog-pid
+
+SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
+source ${SCRIPTPATH}/traceUtils.sh
+
+trace "Monitoring server log file $1 with sleep interval of $2 seconds"
+
+while true; do
+  if grep -q "BEA-141335" $1 ; then
+    msg=("WebLogic server failed to start due to missing or invalid"
+         "situational configuration files, which may be due to invalid"
+         "configOverride templates (these are specified via the"
+         "configOverride attribute in the Domain custom resource)."
+         "For details, please search your pod log or"
+         "${SERVER_OUT_FILE} for the keyword 'situational'."
+        )
+    trace "${msg[*]}"
+    exit 0
+  fi
+  if grep -q "BEA-000360" $1 ; then
+    trace "WebLogic Server started successfully. Script exiting."
+    exit 0
+  fi
+  sleep $2
+done
+

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

@@ -102,6 +102,12 @@ function waitUntilShutdown() {
     trace "Showing the server out file from ${SERVER_OUT_FILE}"
     ${SCRIPTPATH}/tailLog.sh ${SERVER_OUT_FILE} &
   fi
+  FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR=${FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR:-true} 
+  SERVER_OUT_MONITOR_INTERVAL=${SERVER_OUT_MONITOR_INTERVAL:-30}
+  if [ ${FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR} == 'true' ] ; then
+    trace "Monitor server out file ${SERVER_OUT_FILE} for certain known errors"
+    ${SCRIPTPATH}/monitorLog.sh ${SERVER_OUT_FILE} ${SERVER_OUT_MONITOR_INTERVAL} &
+  fi
   waitForShutdownMarker
 }
 
@@ -110,19 +116,7 @@ function waitForShutdownMarker() {
   # Wait forever.   Kubernetes will monitor this pod via liveness and readyness probes.
   #
   trace "Wait indefinitely so that the Kubernetes pod does not exit and try to restart"
-  logged=false
   while true; do
-    if [ "$logged" != 'true' ] && grep -q "BEA-141335" ${SERVER_OUT_FILE} ; then
-      msg=("WebLogic server failed to start due to missing or invalid"
-           "situational configuration files, which may be due to invalid"
-           "configOverride templates (these are specified via the"
-           "configOverride attribute in the Domain custom resource)."
-           "For details, please search your pod log or"
-           "${SERVER_OUT_FILE} for the keyword 'situational'."
-          )
-      trace "${msg[*]}"
-      logged=true
-    fi
     if [ -e /weblogic-operator/doShutdown ] ; then
       exit 0
     fi
@@ -150,8 +144,7 @@ function copySitCfg() {
     for local_fname in ${src_dir}/${fil_prefix}*.xml ; do
       copyIfChanged $local_fname $tgt_dir/`basename ${local_fname/${fil_prefix}//}`
       trace "Printing contents of situational configuration file $local_fname:"
-      file_content=`cat $local_fname`
-      echo "$file_content"
+      echo `cat $local_fname`
     done
   fi
 

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

@@ -10,5 +10,5 @@
 # running this script.
 #
 
-echo $$ > /weblogic-operator/pid
-tail -F -n +0 $1
+echo $$ > /tmp/tailLog-pid
+tail -F -n +0 $1

operator/src/test/java/oracle/kubernetes/operator/helpers/ConfigMapHelperTest.java

@@ -69,7 +69,8 @@ public class ConfigMapHelperTest {
     "traceUtils.py",
     "traceUtils.sh",
     "wlst.sh",
-    "tailLog.sh"
+    "tailLog.sh",
+    "monitorLog.sh"
   };
 
   private static final String introspectResult =