status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-01-11 14:34:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #557 from embark-framework/bug_fix/hanging-graph

Browse Source 
Fix hanging embark graph by starting web3 service
This commit is contained in:
Iuri Matias 2018-06-19 11:38:21 -04:00 committed by GitHub
commit d2489f0da8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/index.js
View File

@ -16,7 +16,7 @@ let version = require('../package.json').version;
class Embark {
constructor (options) {
constructor(options) {
this.version = version;
this.options = options || {};
}
@ -129,7 +129,7 @@ class Embark {
engine.events.on('check:backOnline:Ethereum', function () {
engine.logger.info(__('Ethereum node detected') + '..');
engine.config.reloadConfig();
engine.events.request('deploy:contracts', function(err) {
engine.events.request('deploy:contracts', function (err) {
if (err) {
return;
}
@ -201,7 +201,7 @@ class Embark {
callback();
},
function deploy(callback) {
engine.events.request('deploy:contracts', function(err) {
engine.events.request('deploy:contracts', function (err) {
callback(err);
});
},
@ -239,8 +239,7 @@ class Embark {
});
engine.init();
async.parallel([
async.waterfall([
function (callback) {
let pluginList = engine.plugins.listPlugins();
if (pluginList.length > 0) {
@ -251,14 +250,12 @@ class Embark {
engine.startService("libraryManager");
engine.startService("pipeline");
engine.startService("deployment", {onlyCompile: true});
engine.startService("web3");
engine.startService("codeGenerator");
engine.events.request('deploy:contracts', function(err) {
callback(err);
});
engine.events.request('deploy:contracts', callback);
}
], (err, _result) => {
], (err) => {
if (err) {
engine.logger.error(err.message);
engine.logger.info(err.stack);
@ -320,7 +317,7 @@ class Embark {
engine.startService("codeGenerator");
callback();
},
function setupStoragePlugin(callback){
function setupStoragePlugin(callback) {
let pluginList = engine.plugins.listPlugins();
if (pluginList.length > 0) {
engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
@ -350,9 +347,9 @@ class Embark {
.catch(callback);
});
engine.events.request('deploy:contracts', function(err) {
engine.events.request('deploy:contracts', function (err) {
engine.logger.info(__("finished deploying").underline);
if(err){
if (err) {
callback(err);
}
});