From 64628a4d7ddcb78d6904d48bc51c3ad9f8b9131f Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Fri, 22 Jan 2021 09:54:07 -0800
Subject: [PATCH] fix(dev-infra): write to unique log file for `FATAL_ERROR`s
 in release tooling (#40524)

Write to the unique log file, to prevent being overwritten, for `FATAL_ERROR`
failures in the release tooling.  This will help to assist in determining where
something goes wrong in the process as well as being able to resume the action.

PR Close #40524
---
 dev-infra/ng-dev.js              | 11 ++++++++---
 dev-infra/release/publish/cli.ts |  3 ++-
 dev-infra/utils/console.ts       |  8 ++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/dev-infra/ng-dev.js b/dev-infra/ng-dev.js
index 7fc25d5c19..80451d2834 100755
--- a/dev-infra/ng-dev.js
+++ b/dev-infra/ng-dev.js
@@ -387,7 +387,9 @@ function captureLogOutputForCommand(argv) {
     LOGGED_TEXT += headerLine + "\nCommand: " + argv.$0 + " " + argv._.join(' ') + "\nRan at: " + now + "\n";
     // On process exit, write the logged output to the appropriate log files
     process.on('exit', function (code) {
-        LOGGED_TEXT += "Command ran in " + (new Date().getTime() - now.getTime()) + "ms";
+        LOGGED_TEXT += headerLine + "\n";
+        LOGGED_TEXT += "Command ran in " + (new Date().getTime() - now.getTime()) + "ms\n";
+        LOGGED_TEXT += "Exit Code: " + code + "\n";
         /** Path to the log file location. */
         var logFilePath = path.join(getRepoBaseDir(), '.ng-dev.log');
         // Strip ANSI escape codes from log outputs.
@@ -396,7 +398,9 @@ function captureLogOutputForCommand(argv) {
         // For failure codes greater than 1, the new logged lines should be written to a specific log
         // file for the command run failure.
         if (code > 1) {
-            fs.writeFileSync(path.join(getRepoBaseDir(), ".ng-dev.err-" + now.getTime() + ".log"), LOGGED_TEXT);
+            var logFileName = ".ng-dev.err-" + now.getTime() + ".log";
+            console.error("Exit code: " + code + ". Writing full log to " + logFileName);
+            fs.writeFileSync(path.join(getRepoBaseDir(), logFileName), LOGGED_TEXT);
         }
     });
     // Mark file logging as enabled to prevent the function from executing multiple times.
@@ -6489,10 +6493,11 @@ function handler$9(args) {
         switch (result) {
             case CompletionState.FATAL_ERROR:
                 error(red(`Release action has been aborted due to fatal errors. See above.`));
-                process.exitCode = 1;
+                process.exitCode = 2;
                 break;
             case CompletionState.MANUALLY_ABORTED:
                 info(yellow(`Release action has been manually aborted.`));
+                process.exitCode = 1;
                 break;
             case CompletionState.SUCCESS:
                 info(green(`Release action has completed successfully.`));
diff --git a/dev-infra/release/publish/cli.ts b/dev-infra/release/publish/cli.ts
index 171f2edb28..068f2cf93e 100644
--- a/dev-infra/release/publish/cli.ts
+++ b/dev-infra/release/publish/cli.ts
@@ -36,10 +36,11 @@ async function handler(args: Arguments<ReleasePublishOptions>) {
   switch (result) {
     case CompletionState.FATAL_ERROR:
       error(red(`Release action has been aborted due to fatal errors. See above.`));
-      process.exitCode = 1;
+      process.exitCode = 2;
       break;
     case CompletionState.MANUALLY_ABORTED:
       info(yellow(`Release action has been manually aborted.`));
+      process.exitCode = 1;
       break;
     case CompletionState.SUCCESS:
       info(green(`Release action has completed successfully.`));
diff --git a/dev-infra/utils/console.ts b/dev-infra/utils/console.ts
index 41d2c8a3a5..283aeec982 100644
--- a/dev-infra/utils/console.ts
+++ b/dev-infra/utils/console.ts
@@ -193,7 +193,9 @@ export function captureLogOutputForCommand(argv: Arguments) {
 
   // On process exit, write the logged output to the appropriate log files
   process.on('exit', (code: number) => {
-    LOGGED_TEXT += `Command ran in ${new Date().getTime() - now.getTime()}ms`;
+    LOGGED_TEXT += `${headerLine}\n`;
+    LOGGED_TEXT += `Command ran in ${new Date().getTime() - now.getTime()}ms\n`;
+    LOGGED_TEXT += `Exit Code: ${code}\n`;
     /** Path to the log file location. */
     const logFilePath = join(getRepoBaseDir(), '.ng-dev.log');
 
@@ -205,7 +207,9 @@ export function captureLogOutputForCommand(argv: Arguments) {
     // For failure codes greater than 1, the new logged lines should be written to a specific log
     // file for the command run failure.
     if (code > 1) {
-      writeFileSync(join(getRepoBaseDir(), `.ng-dev.err-${now.getTime()}.log`), LOGGED_TEXT);
+      const logFileName = `.ng-dev.err-${now.getTime()}.log`;
+      console.error(`Exit code: ${code}. Writing full log to ${logFileName}`);
+      writeFileSync(join(getRepoBaseDir(), logFileName), LOGGED_TEXT);
     }
   });