mirror of https://github.com/embarklabs/embark.git
support --noserver option
This commit is contained in:
parent
60285ea1c0
commit
655f56f893
|
@ -64,6 +64,7 @@ Cmd.prototype.run = function() {
|
||||||
.command('run [environment]')
|
.command('run [environment]')
|
||||||
.option('-p, --port [port]', 'port to run the dev webserver (default: 8000)')
|
.option('-p, --port [port]', 'port to run the dev webserver (default: 8000)')
|
||||||
.option('-b, --host [host]', 'host to run the dev webserver (default: localhost)')
|
.option('-b, --host [host]', 'host to run the dev webserver (default: localhost)')
|
||||||
|
.option('--noserver', 'disable the development webserver')
|
||||||
.description('run dapp (default: development)')
|
.description('run dapp (default: development)')
|
||||||
.action(function(env, options) {
|
.action(function(env, options) {
|
||||||
self.Embark.initConfig(env || 'development', {
|
self.Embark.initConfig(env || 'development', {
|
||||||
|
@ -72,7 +73,8 @@ Cmd.prototype.run = function() {
|
||||||
self.Embark.run({
|
self.Embark.run({
|
||||||
env: env || 'development',
|
env: env || 'development',
|
||||||
serverPort: options.port,
|
serverPort: options.port,
|
||||||
serverHost: options.host
|
serverHost: options.host,
|
||||||
|
runWebserver: !options.noserver
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -81,13 +81,17 @@ var Embark = {
|
||||||
logger: Embark.logger,
|
logger: Embark.logger,
|
||||||
config: Embark.config,
|
config: Embark.config,
|
||||||
serverHost: options.serverHost,
|
serverHost: options.serverHost,
|
||||||
serverPort: options.serverPort
|
serverPort: options.serverPort,
|
||||||
|
runWebserver: options.runWebserver
|
||||||
});
|
});
|
||||||
Embark.servicesMonitor.startMonitor();
|
Embark.servicesMonitor.startMonitor();
|
||||||
callback();
|
callback();
|
||||||
},
|
},
|
||||||
self.buildDeployGenerate.bind(self),
|
self.buildDeployGenerate.bind(self),
|
||||||
function startAssetServer(callback) {
|
function startAssetServer(callback) {
|
||||||
|
if (!options.runWebserver) {
|
||||||
|
return callback();
|
||||||
|
}
|
||||||
Embark.monitor.setStatus("Starting Server");
|
Embark.monitor.setStatus("Starting Server");
|
||||||
var server = new Server({
|
var server = new Server({
|
||||||
logger: self.logger,
|
logger: self.logger,
|
||||||
|
|
|
@ -8,6 +8,7 @@ var ServicesMonitor = function(options) {
|
||||||
this.config = options.config;
|
this.config = options.config;
|
||||||
this.serverHost = options.serverHost || 'localhost';
|
this.serverHost = options.serverHost || 'localhost';
|
||||||
this.serverPort = options.serverPort || 8000;
|
this.serverPort = options.serverPort || 8000;
|
||||||
|
this.runWebserver = options.runWebserver;
|
||||||
};
|
};
|
||||||
|
|
||||||
ServicesMonitor.prototype.startMonitor = function() {
|
ServicesMonitor.prototype.startMonitor = function() {
|
||||||
|
@ -65,7 +66,9 @@ ServicesMonitor.prototype.check = function() {
|
||||||
},
|
},
|
||||||
function checkDevServer(result, callback) {
|
function checkDevServer(result, callback) {
|
||||||
self.logger.trace('checkDevServer');
|
self.logger.trace('checkDevServer');
|
||||||
result.push(('dev server (http://' + self.serverHost + ':' + self.serverPort + ')').green);
|
var devServer = 'dev server (http://' + self.serverHost + ':' + self.serverPort + ')';
|
||||||
|
devServer = (self.runWebserver) ? devServer.green : devServer.red;
|
||||||
|
result.push(devServer);
|
||||||
callback(null, result);
|
callback(null, result);
|
||||||
}
|
}
|
||||||
], function(err, result) {
|
], function(err, result) {
|
||||||
|
|
Loading…
Reference in New Issue