Skip to content

Commit

Permalink
Merge pull request #147 from strongloop/optional-control-path
Browse files Browse the repository at this point in the history
run: ws endpoint now has default
  • Loading branch information
sam-github committed Jul 7, 2015
2 parents 61a4dcf + 1cce638 commit 3072930
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion lib/options.js
Expand Up @@ -184,7 +184,11 @@ exports.parse = function parse(argv) {
}

if (options.channel && url.parse(options.channel).protocol) {
options.channel = defaults(options.channel, {}, {protocol: 'ws'});
options.channel = defaults(options.channel, {
path: 'supervisor-control'
}, {
protocol: 'ws'
});
process.env.STRONGLOOP_CONTROL = options.channel;
options.channel = false;
} else {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -50,7 +50,7 @@
"strong-npm-ls": "^1.0.0",
"strong-statsd": "^2.0.0",
"strong-trace": "^1.2.0",
"strong-url-defaults": "^1.1.0",
"strong-url-defaults": "^1.2.0",
"strongloop-license": "^1.3.0"
},
"devDependencies": {
Expand Down

0 comments on commit 3072930

Please sign in to comment.