embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor fixes for rebase

This commit is contained in:
emizzle 2018-10-25 07:21:08 +02:00 committed by Pascal Precht
parent 9a830c3423
commit dcdcfb5b32
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/core/engine.js
View File

@ -134,10 +134,17 @@ class Engine {
}
pipelineService(_options) {
this.registerModule('pipeline', {plugins: this.plugins, env: this.env, webpackConfigName: this.webpackConfigName});
const pipeline = new Pipeline({
this.events.on('code-generator-ready', function () {
pipeline.build(abi, contractsJSON, null, () => {
const self = this;
this.registerModule('pipeline', {
webpackConfigName: this.webpackConfigName
});
this.events.on('code-generator-ready', function (modifiedAssets) {
self.events.request('code', function (abi, contractsJSON) {
self.events.request('pipeline:build', {abi, contractsJSON, modifiedAssets}, () => {
self.events.emit('outputDone');
});
});
});
}
serviceMonitor() {

2
lib/modules/blockchain_process/blockchain.js
View File

@ -239,7 +239,7 @@ Blockchain.prototype.run = function () {
}
self.readyCallback();
}
this.logger.info(`${self.client.name}: ${data}`);
self.logger.info(`${self.client.name}: ${data}`);
});
self.child.on('exit', (code) => {