From 227c11d37f9968908e342341525c4d7877d2cb03 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:07:17 +0100
Subject: [PATCH] Grafana-Toolkit: Improve error messages when tasks fail
 (#36381)

---
 packages/grafana-toolkit/src/cli/utils/useSpinner.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/grafana-toolkit/src/cli/utils/useSpinner.ts b/packages/grafana-toolkit/src/cli/utils/useSpinner.ts
index 8f430cb5a46..193778bc2a4 100644
--- a/packages/grafana-toolkit/src/cli/utils/useSpinner.ts
+++ b/packages/grafana-toolkit/src/cli/utils/useSpinner.ts
@@ -6,9 +6,15 @@ export const useSpinner = async (label: string, fn: () => Promise<any>, killProc
   try {
     await fn();
     spinner.succeed();
-  } catch (e) {
-    console.trace(e); // eslint-disable-line no-console
-    spinner.fail(e.message || e);
+  } catch (err) {
+    spinner.fail(err.message || err);
+
+    if (err.stdout) {
+      console.error(err.stdout);
+    } else {
+      console.trace(err); // eslint-disable-line no-console
+    }
+
     if (killProcess) {
       process.exit(1);
     }