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

Merge pull request #632 from embark-framework/bug_fix/run_flags_round_2 

don't forward host/port cli options if the options weren't specified
This commit is contained in:
Michael Bradley 2018-07-17 19:40:37 -05:00 committed by GitHub
parent e61b38e3a4 4058c08ff1
commit 328399bd9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/index.js
View File

@ -65,6 +65,17 @@ class Embark {
self.context = options.context || [constants.contexts.run, constants.contexts.build]; self.context = options.context || [constants.contexts.run, constants.contexts.build];
let Dashboard = require('./dashboard/dashboard.js'); let Dashboard = require('./dashboard/dashboard.js');
let webServerConfig = {
enabled: options.runWebserver
};
if (options.serverHost) {
webServerConfig.host = options.serverHost;
}
if (options.serverPort) {
webServerConfig.port = options.serverPort;
}
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,
@ -76,11 +87,7 @@ class Embark {
logLevel: options.logLevel, logLevel: options.logLevel,
context: self.context, context: self.context,
useDashboard: options.useDashboard, useDashboard: options.useDashboard,
webServerConfig: { webServerConfig: webServerConfig
enabled: options.runWebserver,
host: options.serverHost,
port: options.serverPort
}
}); });
engine.init(); engine.init();