Add support of copying WDT post create hooks output files to log home and refactor the old logic

Author: jshum2479

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

@@ -19,8 +19,9 @@ IMG_VARIABLE_FILES_ROOTDIR="${IMG_MODELS_HOME}"
 WDT_ROOT="/auxiliary/weblogic-deploy"
 WDT_OUTPUT_DIR="${LOG_HOME:-/tmp}"
 WDT_OUTPUT="${WDT_OUTPUT_DIR}/wdt_output.log"
-WDT_CREATE_DOMAIN_LOGROOT="${WLSDEPLOY_LOG_DIRECTORY:-$(echo ${WDT_ROOT}/logs)}"
-WDT_CREATE_DOMAIN_LOG="${WDT_CREATE_DOMAIN_LOGROOT}/createDomain.log"
+WDT_CREATE_DOMAIN_LOG=createDomain.log
+
+
 WDT_BINDIR="${WDT_ROOT}/bin"
 WLSDEPLOY_PROPERTIES="${WLSDEPLOY_PROPERTIES} -Djava.security.egd=file:/dev/./urandom"
 WDT_CONFIGMAP_ROOT="/weblogic-operator/wdt-config-map"
@@ -236,21 +237,18 @@ createDomainFromWDTModel() {
     # We need to prevent retries with a "FatalIntrospectorError".  We are not retrying create domain for now.
     #
     trace SEVERE "Domain On PV: FatalIntrospectorError: WDT Create domain failed, return code ${ret}. ${FATAL_JRF_INTROSPECTOR_ERROR_MSG}"
-
     cat ${WDT_OUTPUT}
-
-    if [ -d "$LOG_HOME" ] ; then
-      cp "$WDT_CREATE_DOMAIN_LOG" "$LOG_HOME"
-      if ls $WDT_ROOT/logs/*.out &> /dev/null ; then (cp $WDT_ROOT/logs/*.out $LOG_HOME) ; fi
-      trace "WDT log files have been copied to '$LOG_HOME'.  Additional RCU log files if any can be found under '$LOG_HOME/rculogdir'"
-    fi
-
     exitOrLoop
   else
     trace "WDT Create Domain Succeeded, ret=${ret}:"
     cat ${WDT_OUTPUT}
   fi
 
+  wdtRotateAndCopyLogFile "${WDT_CREATE_DOMAIN_LOG}"
+  wdtRotateAndCopyOutFile
+
+  trace "WDT log files have been copied to '$LOG_HOME'.  Additional RCU log files if any can be found under '$LOG_HOME/rculogdir'"
+
   # restore trap
   start_trap
 

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

@@ -955,6 +955,7 @@ wdtCreatePrimordialDomain() {
   fi
 
   wdtRotateAndCopyLogFile "${WDT_CREATE_DOMAIN_LOG}"
+  wdtRotateAndCopyOutFile
 
   # restore trap
   start_trap

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

@@ -75,17 +75,33 @@ sort_files() {
   shopt -u nullglob
 }
 
-
-# Function to rotate WDT script log file and copy the file to WDT output dir.
+# Function to rotate WDT script log file and copy the file to log home
 # parameter:
-#   1 - Name of the log file to rotate and copy to WDT output directory.
+#   1 - Name of the log file to rotate and copy to log home.
 wdtRotateAndCopyLogFile() {
   local logFileName=$1
+  # If the special variable WLSDEPLOY_LOG_DIRECTORY is set to log home do nothing
+  # else copy the command log files
+  if [ -d "${LOG_HOME}" ] && [ "${WLSDEPLOY_LOG_DIRECTORY}" != "${LOG_HOME}" ] ; then
+    WDT_LOG_ROOT="${WLSDEPLOY_LOG_DIRECTORY:-$(echo $WDT_ROOT/logs)}"
+    logFileRotate "${LOG_HOME}/${logFileName}" "${WDT_LOG_FILE_MAX:-11}"
+    cp "${WDT_LOG_ROOT}/${logFileName}" "${LOG_HOME}"/
+  fi
+
+}
 
-  logFileRotate "${WDT_OUTPUT_DIR}/${logFileName}" "${WDT_LOG_FILE_MAX:-11}"
+# These out files are generated by WDT post creation hooks
+#
+wdtRotateAndCopyOutFile() {
+
+  if [ -d "${LOG_HOME}" ] && [ "${WLSDEPLOY_LOG_DIRECTORY}" != "${LOG_HOME}" ] ; then
+    WDT_LOG_ROOT="${WLSDEPLOY_LOG_DIRECTORY:-$(echo $WDT_ROOT/logs)}"
+    for file in "${WDT_LOG_ROOT}"/*.out ; do
+      logFileRotate "${LOG_HOME}/${file}" "${WDT_LOG_FILE_MAX:-11}"
+      cp "${WDT_LOG_ROOT}/${file}" "${LOG_HOME}"/
+    done
+  fi
 
-  WDT_LOG_ROOT="${WLSDEPLOY_LOG_DIRECTORY:-$(echo $WDT_ROOT/logs)}"
-  cp "${WDT_LOG_ROOT}/${logFileName}" ${WDT_OUTPUT_DIR}/
 }