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

only put isDev when specifically set

This commit is contained in:
Jonathan Rainville 2018-06-27 14:29:31 -04:00 committed by Iuri Matias
parent cf403df1fb
commit fcbd4739dc
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cmds/blockchain/blockchain.js
View File

@ -165,7 +165,7 @@ Blockchain.prototype.run = function() {
} }
}); });
self.child.stdout.on('data', (data) => { self.child.stdout.on('data', (data) => {
console.log(`Geth error: ${data}`); console.error(`Geth error: ${data}`);
}); });
// Geth logs appear in stderr somehow // Geth logs appear in stderr somehow
self.child.stderr.on('data', (data) => { self.child.stderr.on('data', (data) => {

17
lib/index.js
View File

@ -30,13 +30,8 @@ class Embark {
this.plugins = this.config.plugins; this.plugins = this.config.plugins;
} }
isDev(env) { isDev() {
if (this.config && this.config.blockchainConfig && this.config.blockchainConfig.isDev) { return this.config && this.config.blockchainConfig && this.config.blockchainConfig.isDev;
return true;
} else if (this.config && this.config.blockchainConfig && this.config.blockchainConfig.isDev === false) {
return false;
}
return (env === 'development');
} }
blockchain(env, client) { blockchain(env, client) {
@ -71,7 +66,7 @@ class Embark {
env: options.env, env: options.env,
client: options.client, client: options.client,
locale: options.locale, locale: options.locale,
isDev: this.isDev(options.env), isDev: this.isDev(),
version: this.version, version: this.version,
embarkConfig: options.embarkConfig || 'embark.json', embarkConfig: options.embarkConfig || 'embark.json',
logFile: options.logFile, logFile: options.logFile,
@ -167,7 +162,7 @@ class Embark {
env: options.env, env: options.env,
client: options.client, client: options.client,
locale: options.locale, locale: options.locale,
isDev: this.isDev(options.env), isDev: this.isDev(),
version: this.version, version: this.version,
embarkConfig: 'embark.json', embarkConfig: 'embark.json',
interceptLogs: false, interceptLogs: false,
@ -239,7 +234,7 @@ class Embark {
const Engine = require('./core/engine.js'); const Engine = require('./core/engine.js');
const engine = new Engine({ const engine = new Engine({
env: options.env, env: options.env,
isDev: this.isDev(options.env), isDev: this.isDev(),
version: this.version, version: this.version,
embarkConfig: options.embarkConfig || 'embark.json', embarkConfig: options.embarkConfig || 'embark.json',
logFile: options.logFile, logFile: options.logFile,
@ -294,7 +289,7 @@ class Embark {
env: options.env, env: options.env,
client: options.client, client: options.client,
locale: options.locale, locale: options.locale,
isDev: this.isDev(options.env), isDev: this.isDev(),
version: this.version, version: this.version,
embarkConfig: 'embark.json', embarkConfig: 'embark.json',
interceptLogs: false, interceptLogs: false,