status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #781 from embark-framework/bug_fix/no-webserver-if-false 

Do not start webserver if set to false in embark.json
This commit is contained in:
Iuri Matias 2018-09-05 18:20:31 -04:00 committed by GitHub
parent 81e9cf7ff0 e925200592
commit 428820f2c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/core/config.js
View File

@ -322,6 +322,10 @@ Config.prototype.loadWebServerConfigFile = function() {
let webServerConfig = this._mergeConfig(configFilePath, configObject, false);
if (configFilePath === false) {
this.webServerConfig = {enabled: false};
return;
}
if (this.webServerConfig) {
// cli falgs to `embark run` should override configFile and defaults (configObject)
this.webServerConfig = utils.recursiveMerge(webServerConfig, this.webServerConfig);