From c186517e423de12a2a84dd54b6966a58cea1f5db Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Thu, 1 Jul 2021 16:40:19 -0700
Subject: [PATCH] Updater: Log additional information from ShipIt

---
 ts/updater/common.ts | 5 ++++-
 ts/updater/macos.ts  | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ts/updater/common.ts b/ts/updater/common.ts
index 71bfa18a9..056daae4b 100644
--- a/ts/updater/common.ts
+++ b/ts/updater/common.ts
@@ -372,7 +372,10 @@ export async function deleteTempDir(targetDir: string): Promise<void> {
   await rimrafPromise(targetDir);
 }
 
-export function getPrintableError(error: Error): Error | string {
+export function getPrintableError(error: Error | string): Error | string {
+  if (typeof error === 'string') {
+    return error;
+  }
   return error && error.stack ? error.stack : error;
 }
 
diff --git a/ts/updater/macos.ts b/ts/updater/macos.ts
index fec772ffd..e26edb6d3 100644
--- a/ts/updater/macos.ts
+++ b/ts/updater/macos.ts
@@ -201,8 +201,10 @@ async function handToAutoUpdate(
       try {
         serverUrl = getServerUrl(server);
 
-        autoUpdater.on('error', (error: Error) => {
-          logger.error('autoUpdater: error', getPrintableError(error));
+        autoUpdater.on('error', (...args) => {
+          logger.error('autoUpdater: error', ...args.map(getPrintableError));
+
+          const [error] = args;
           reject(error);
         });
         autoUpdater.on('update-downloaded', () => {