Skip to content

Commit 1973588

Browse files
committed
add support for -p option in embark run to specify web server port
1 parent 1140ebf commit 1973588

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

lib/cmd.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,13 @@ Cmd.prototype.run = function() {
6262
var self = this;
6363
program
6464
.command('run [environment]')
65+
.option('-p, --port [port]', 'port to run the dev webserver')
6566
.description('run dapp (default: development)')
6667
.action(function(env, options) {
6768
self.Embark.initConfig(env || 'development', {
6869
embarkConfig: 'embark.json'
6970
});
70-
self.Embark.run(env || 'development');
71+
self.Embark.run({env: env || 'development', serverPort: options.port});
7172
});
7273
};
7374

lib/index.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ var Embark = {
8686
});
8787
},
8888

89-
run: function(env) {
89+
run: function(options) {
9090
var self = this;
91+
var env = options.env;
9192
async.waterfall([
9293
function startConsole(callback) {
9394
Embark.console = new Console();
@@ -105,7 +106,8 @@ var Embark = {
105106
function monitorServices(callback) {
106107
Embark.servicesMonitor = new ServicesMonitor({
107108
logger: Embark.logger,
108-
config: Embark.config
109+
config: Embark.config,
110+
serverPort: options.serverPort
109111
});
110112
Embark.servicesMonitor.startMonitor();
111113
callback();
@@ -139,7 +141,7 @@ var Embark = {
139141
},
140142
function startAssetServer(callback) {
141143
Embark.monitor.setStatus("Starting Server");
142-
var server = new Server({logger: self.logger});
144+
var server = new Server({logger: self.logger, port: options.serverPort});
143145
server.start(callback);
144146
},
145147
function watchFilesForChanges(callback) {

lib/services.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var ServicesMonitor = function(options) {
66
this.logger = options.logger;
77
this.interval = options.interval || 5000;
88
this.config = options.config;
9+
this.serverPort = options.serverPort || 8000;
910
};
1011

1112
ServicesMonitor.prototype.startMonitor = function() {
@@ -63,7 +64,7 @@ ServicesMonitor.prototype.check = function() {
6364
},
6465
function checkDevServer(result, callback) {
6566
self.logger.trace('checkDevServer');
66-
result.push('dev server (http://localhost:8000)'.green);
67+
result.push(('dev server (http://localhost:' + self.serverPort + ')').green);
6768
callback(null, result);
6869
}
6970
], function(err, result) {

0 commit comments

Comments
 (0)