From 913267b1ce63e7942fc3332db5e265835a01e3c1 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Sun, 13 Oct 2019 21:31:20 -0400
Subject: [PATCH] fix: fix process logs not showing on errors (#1962)

---
 packages/core/utils/src/logHandler.js               |  7 ++++---
 packages/embark/src/cmd/cmd_controller.js           | 13 +++++++++----
 packages/embark/src/lib/modules/blockchain/index.js |  4 ++--
 packages/embark/src/lib/modules/geth/blockchain.js  |  4 ++--
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/core/utils/src/logHandler.js b/packages/core/utils/src/logHandler.js
index 1588e078f..cadb15871 100644
--- a/packages/core/utils/src/logHandler.js
+++ b/packages/core/utils/src/logHandler.js
@@ -45,6 +45,7 @@ class LogHandler {
    */
   handleLog(msg, alreadyLogged = false) {
     if (!msg) return;
+    msg.logLevel = msg.logLevel || msg.type;
 
     // Sometimes messages come in with line breaks, so we need to break them up accordingly.
     let processedMessages = [];
@@ -86,11 +87,11 @@ class LogHandler {
       }
       this.logs.push(log);
       this.events.emit(`process-log-${this.processName}`, log);
-      if ((this.silent && msg.type !== 'error') || alreadyLogged) {
+      if ((this.silent && msg.logLevel !== 'error') || alreadyLogged) {
         return;
       }
-      if (this.logger[msg.type]) {
-        return this.logger[msg.type](normalizeInput(message));
+      if (this.logger[msg.logLevel]) {
+        return this.logger[msg.logLevel](normalizeInput(message));
       }
       this.logger.debug(normalizeInput(message));
     });
diff --git a/packages/embark/src/cmd/cmd_controller.js b/packages/embark/src/cmd/cmd_controller.js
index ad8843934..2a23b483a 100644
--- a/packages/embark/src/cmd/cmd_controller.js
+++ b/packages/embark/src/cmd/cmd_controller.js
@@ -61,10 +61,15 @@ class EmbarkController {
       engine.registerModuleGroup("blockchain");
 
       engine.startEngine(async () => {
-        const alreadyStarted = await engine.events.request2("blockchain:node:start", Object.assign(engine.config.blockchainConfig, {isStandalone: true}));
-        if (alreadyStarted) {
-          engine.logger.warn(__('Blockchain process already started. No need to run `embark blockchain`'));
-          process.exit(0);
+        try {
+          const alreadyStarted = await engine.events.request2("blockchain:node:start", Object.assign(engine.config.blockchainConfig, {isStandalone: true}));
+          if (alreadyStarted) {
+            engine.logger.warn(__('Blockchain process already started. No need to run `embark blockchain`'));
+            process.exit(0);
+          }
+        } catch (e) {
+          engine.logger.error(e);
+          process.exit(1);
         }
       });
     });
diff --git a/packages/embark/src/lib/modules/blockchain/index.js b/packages/embark/src/lib/modules/blockchain/index.js
index 92fe5a891..6d5e02607 100644
--- a/packages/embark/src/lib/modules/blockchain/index.js
+++ b/packages/embark/src/lib/modules/blockchain/index.js
@@ -59,7 +59,7 @@ class Blockchain {
           }
           const clientFunctions = this.blockchainNodes[clientName];
           if (!clientFunctions) {
-            return cb(__("Client %s not found", clientName));
+            return cb(__("Client %s not found in registered plugins", clientName));
           }
 
           let onStart = () => {
@@ -91,7 +91,7 @@ class Blockchain {
 
       const clientFunctions = this.blockchainNodes[clientName];
       if (!clientFunctions) {
-        return cb(__("Client %s not found", clientName));
+        return cb(__("Client %s not found in registered plugins", clientName));
       }
 
       clientFunctions.stopFn.apply(clientFunctions, [
diff --git a/packages/embark/src/lib/modules/geth/blockchain.js b/packages/embark/src/lib/modules/geth/blockchain.js
index dff5852cd..80ffc84a5 100644
--- a/packages/embark/src/lib/modules/geth/blockchain.js
+++ b/packages/embark/src/lib/modules/geth/blockchain.js
@@ -199,8 +199,8 @@ Blockchain.prototype.run = function () {
     }
   ], function(err, cmd, args) {
     if (err) {
-      self.logger.error(err.message);
-      return;
+      self.logger.error(err.message || err);
+      process.exit(1);
     }
     args = compact(args);