From 72fc80df53785f802a121f209c3088ad7817e884 Mon Sep 17 00:00:00 2001
From: Pascal Precht <pascal.precht@gmail.com>
Date: Tue, 16 Apr 2019 14:32:26 +0200
Subject: [PATCH] fix(@embark/deployment): ensure error messages emitted are
 logged

Errors emitted as part of the `deployAll()` routine got swallowed by
Embark, leaving users in the unknown when the deployment process
"froze".

This commit ensures errors emitted are now logged, making it obvious
when something went wrong.
---
 .../src/lib/modules/deployment/contract_deployer.js |  7 +++++--
 packages/embark/src/lib/modules/deployment/index.js | 13 ++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/embark/src/lib/modules/deployment/contract_deployer.js b/packages/embark/src/lib/modules/deployment/contract_deployer.js
index de6fd9f06..861b0f225 100644
--- a/packages/embark/src/lib/modules/deployment/contract_deployer.js
+++ b/packages/embark/src/lib/modules/deployment/contract_deployer.js
@@ -353,8 +353,11 @@ class ContractDeployer {
           self.events.emit("deploy:contract:deployed", contract);
 
           self.registerContract(contract, () => {
-            self.plugins.runActionsForEvent('deploy:contract:deployed', {contract: contract}, () => {
-              return next(null, receipt);
+            self.plugins.runActionsForEvent('deploy:contract:deployed', {contract: contract}, (err) => {
+              if (err) {
+                return next(err);
+              }
+              next(null, receipt);
             });
           });
         }, hash => {
diff --git a/packages/embark/src/lib/modules/deployment/index.js b/packages/embark/src/lib/modules/deployment/index.js
index 5cd0622a3..4a5f5c602 100644
--- a/packages/embark/src/lib/modules/deployment/index.js
+++ b/packages/embark/src/lib/modules/deployment/index.js
@@ -61,7 +61,7 @@ class DeployManager {
               next();
             });
           },
-          function () {
+          function (next) {
             const contractDeploys = {};
             const errors = [];
             contracts.forEach(contract => {
@@ -97,17 +97,20 @@ class DeployManager {
                 _err = __("Error deploying contracts. Please fix errors to continue.");
                 self.logger.error(_err);
                 self.events.emit("outputError", __("Error deploying contracts, please check console"));
-                return done(_err);
+                return next(_err);
               }
               if (contracts.length === 0) {
                 self.logger.info(__("no contracts found"));
-                return done();
+                return next();
               }
               self.logger.info(__("finished deploying contracts"));
-              done(err);
+              next(err);
             });
           }
-        ]);
+        ], (err) => {
+          self.logger.error(err);
+          done(err);
+        });
       });
     });
   }