Skip to content

Fix hanging embark graph by starting web3 service #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 19, 2018
Merged

Fix hanging embark graph by starting web3 service #557

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ require('colors');
// Override process.chdir so that we have a partial-implementation PWD for Windows
const realChdir = process.chdir;
process.chdir = (...args) => {
if (!process.env.PWD) {
process.env.PWD = process.cwd();
}
realChdir(...args);
if (!process.env.PWD) {
process.env.PWD = process.cwd();
}
realChdir(...args);
};

let version = require('../package.json').version;

class Embark {

constructor (options) {
constructor(options) {
this.version = version;
this.options = options || {};
}
Expand Down Expand Up @@ -52,7 +52,7 @@ class Embark {
this.context = options.context || [constants.contexts.simulator, constants.contexts.blockchain];
let Simulator = require('./cmds/simulator.js');
let simulator = new Simulator({
blockchainConfig: this.config.blockchainConfig,
blockchainConfig: this.config.blockchainConfig,
logger: this.logger
});
simulator.run(options);
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
});
},
Expand All @@ -227,7 +227,7 @@ class Embark {
graph(options) {
this.context = options.context || [constants.contexts.graph];
options.onlyCompile = true;

const Engine = require('./core/engine.js');
const engine = new Engine({
env: options.env,
Expand All @@ -239,8 +239,7 @@ class Embark {
});
engine.init();

async.parallel([

async.waterfall([
function (callback) {
let pluginList = engine.plugins.listPlugins();
if (pluginList.length > 0) {
Expand All @@ -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);
Expand Down Expand Up @@ -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(", "));
Expand All @@ -344,15 +341,15 @@ class Embark {
function deploy(callback) {
engine.events.on('outputDone', function () {
cmdPlugin.uploadCmds[0].cb()
.then((success) => {
callback(null, success);
})
.catch(callback);
.then((success) => {
callback(null, success);
})
.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);
}
});
Expand Down