Merge pull request #726 from zowe/v3.x/logging

Do not log into `zowe.runtimeDirectory`
zowe · Aug 28, 2024 · 144625d · 144625d
2 parents a972451 + b55b510
commit 144625d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to the ZSS package will be documented in this file.
 
 ## `3.0.0`
-
+- Enhancement: if no `zowe.logDirectory` is defined in config, logging is disabled. (#726)
 
 ## `2.18.0`
 - Change log level for setting default value of 'httpRequestHeapMaxBlocks' to DEBUG instead of INFO.(#719)

diff --git a/bin/start.sh b/bin/start.sh
@@ -74,20 +74,27 @@ if [[ "${OSNAME}" == "OS/390" ]]; then
       then
         ZWES_LOG_DIR=${ZWE_zowe_logDirectory}
       else
-        ZWES_LOG_DIR="../log"
+        if [ -z "${ZWE_zowe_runtimeDirectory}" ]; then
+          ZWES_LOG_DIR="../log"
+        else
+          echo "No log directory. Logging disabled."
+          ZWES_LOG_DIR=
+          ZWES_LOG_FILE=/dev/null
+        fi
       fi
     fi
     if [ -f "$ZWES_LOG_DIR" ]
     then
       ZWES_LOG_FILE=$ZWES_LOG_DIR
     elif [ ! -d "$ZWES_LOG_DIR" ]
     then
-      echo "Will make log directory $ZWES_LOG_DIR"
-      mkdir -p $ZWES_LOG_DIR
-      if [ $? -ne 0 ]
-      then
-        echo "Cannot make log directory.  Logging disabled."
-        ZWES_LOG_FILE=/dev/null
+      if [ -n "${ZWES_LOG_DIR}" ]; then
+        echo "Will make log directory $ZWES_LOG_DIR"
+        mkdir -p $ZWES_LOG_DIR
+        if [ $? -ne 0 ]; then
+          echo "Cannot make log directory.  Logging disabled."
+          ZWES_LOG_FILE=/dev/null
+        fi
       fi
     fi
     ZWES_ROTATE_LOGS=0