From 0ad96dd0c4403e53aca56f5fadd9d2e31ae06db2 Mon Sep 17 00:00:00 2001
From: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
Date: Wed, 6 Nov 2024 09:30:17 +0100
Subject: [PATCH] Use xplatform for logging

Signed-off-by: Martin Zeithaml <Martin.Zeithaml@broadcom.com>
---
 CHANGELOG.md       |  3 ++-
 bin/libs/common.ts | 33 +++++++++------------------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47b1fe90de..4d0ce09f1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@
 All notable changes to the Zowe Installer will be documented in this file.
 
 ## `3.0.1`
-- Bugfix: When `--log-dir` parameter for `zwe` command is a file, there might be an error "InternalError: stack overflow". [#40nn](https://github.com/zowe/zowe-install-packaging/pull/40nn)
+- Bugfix: When logging `zwe` command, sometimes the log has wrong file tag and the log is unreadable. [#40nn](https://github.com/zowe/zowe-install-packaging/pull/40nn)
+- Bugfix: When `--log-dir` parameter for `zwe` command is a file, there might be an error "InternalError: stack overflow". [#4064](https://github.com/zowe/zowe-install-packaging/pull/4064)
 - Enhancement: new javascript funtion `getStatvfs()` to obtain information about the file sysytem [#3994](https://github.com/zowe/zowe-install-packaging/pull/3994)
 - Enhancement: schema validation update for `zowe.job.name` and `zowe.job.prefix` [#4060](https://github.com/zowe/zowe-install-packaging/pull/4060)
 
diff --git a/bin/libs/common.ts b/bin/libs/common.ts
index ad3457926c..47bdd94dcc 100644
--- a/bin/libs/common.ts
+++ b/bin/libs/common.ts
@@ -128,36 +128,21 @@ export function date(...args: string[]): string|undefined {
 
 
 let logExists = false;
-let logFile:std.File|null = null;
 
 function writeLog(message: string): boolean {
+  const filename = std.getenv('ZWE_PRIVATE_LOG_FILE');
+  if (!filename) {
+      return false;
+  }
+  logExists = fs.fileExists(filename);
   if (!logExists) {
-    const filename = std.getenv('ZWE_PRIVATE_LOG_FILE');
-    if (filename) {
+      fs.createFile(filename, 0o640, message);
       logExists = fs.fileExists(filename);
-      if (!logExists) {
-        fs.createFile(filename, 0o640, message);
-        logExists = fs.fileExists(filename);
-      }
-      if (logExists) {
-        let errObj = {errno:undefined};
-        logFile = std.open(filename, 'w', errObj);
-        if (errObj.errno) {
-          printError(`Error opening file ${filename}, errno=${errObj.errno}`);
-          logFile=null;
-          logExists=false;
-          return false;
-        }
-      }
-    }
-  }
-  if (logFile===undefined || logFile===null) {
-    return false;
   } else {
-    //TODO this does utf8. should we flip it to 1047 on zos?
-    logFile.puts(message);
-    return true;
+      xplatform.appendFileUTF8(filename, xplatform.AUTO_DETECT, message);
+      return true;
   }
+  return logExists;
 }