Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-06-15 05:03:39 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't listen on SSL when port overridden

Browse Source 
If the port is overridden (either through commandline, test framework,
or environment variable), we probably don't want to listen on any
other port, like the SSL port.
This commit is contained in:
Guangcong Luo 2015-03-23 02:36:57 -04:00
parent 2587652ecd
commit b6aea81fdf
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sockets.js
View File

@ -114,7 +114,13 @@ if (cluster.isMaster) {
} else {
// is worker
if (process.env.PSPORT) Config.port = +process.env.PSPORT;
var portOverridden = false;
if (process.env.PSPORT) {
if ((+Config.port || 8000) !== (+process.env.PSPORT)) {
portOverridden = true;
}
Config.port = +process.env.PSPORT;
}
if (process.env.PSBINDADDR) Config.bindaddress = process.env.PSBINDADDR;
// ofe is optional
@ -141,7 +147,10 @@ if (cluster.isMaster) {
var app = require('http').createServer();
var appssl;
if (Config.ssl) {
if (Config.ssl && !portOverridden) {
// If a port is overridden (either through commandline, test framework,
// or environment variable), we probably don't want to listen on the
// SSL port
appssl = require('https').createServer(Config.ssl.options);
}
try {