KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trying a fix for adminpanelserver

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-02-05 20:21:00 +01:00
parent bcbfeed151
commit 2645a9b9dc
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/app.js
View File

@@ -57,7 +57,7 @@ function startClustered(redis_enabled) {
function startSingle(clustered, redis_enabled) { function startSingle(clustered, redis_enabled) {
var client = require('./client.js'); var client = require('./client.js');
var admin = require('./admin.js'); var admin = require('./admin.js');
var server; var client_server;
var admin_server; var admin_server;
try { try {
var cert_config = require(path.join(path.join(__dirname, 'config'), 'cert_config.js')); var cert_config = require(path.join(path.join(__dirname, 'config'), 'cert_config.js'));
@@ -72,12 +72,12 @@ function startSingle(clustered, redis_enabled) {
}; };
var https = require('https'); var https = require('https');
server = https.Server(credentials, client); client_server = https.Server(credentials, client);
admin_server = https.Server(credentials, admin); admin_server = https.Server(credentials, admin);
} catch(err){ } catch(err){
console.log("Starting without https (probably on localhost)"); console.log("Starting without https (probably on localhost)");
server = http.Server(client); client_server = http.Server(client);
admin_server = http.Server(admin); admin_server = http.Server(admin);
//add = ",http://localhost:80*,http://localhost:8080*,localhost:8080*, localhost:8082*,http://zoff.dev:80*,http://zoff.dev:8080*,zoff.dev:8080*, zoff.dev:8082*"; //add = ",http://localhost:80*,http://localhost:8080*,localhost:8080*, localhost:8082*,http://zoff.dev:80*,http://zoff.dev:8080*,zoff.dev:8080*, zoff.dev:8082*";
} }
@@ -87,10 +87,10 @@ function startSingle(clustered, redis_enabled) {
if(clustered) { if(clustered) {
app app
.use( vhost('*', function(req, res) { .use( vhost('*', function(req, res) {
server.emit("request", req, res); client_server.emit("request", req, res);
}) ) }) )
.use( vhost('remote.*', function(req, res) { .use( vhost('remote.*', function(req, res) {
server.emit("request", req, res); client_server.emit("request", req, res);
}) ) }) )
.use( vhost('admin.*', function(req, res) { .use( vhost('admin.*', function(req, res) {
admin_server.emit("request", req, res); admin_server.emit("request", req, res);
@@ -100,10 +100,10 @@ function startSingle(clustered, redis_enabled) {
} else { } else {
app app
.use( vhost('*', function(req, res) { .use( vhost('*', function(req, res) {
server.emit("request", req, res); client_server.emit("request", req, res);
}) ) }) )
.use( vhost('remote.*', function(req, res) { .use( vhost('remote.*', function(req, res) {
server.emit("request", req, res); client_server.emit("request", req, res);
}) ) }) )
.use( vhost('admin.*', function(req, res) { .use( vhost('admin.*', function(req, res) {
admin_server.emit("request", req, res); admin_server.emit("request", req, res);
@@ -121,16 +121,16 @@ function startSingle(clustered, redis_enabled) {
} catch(e) { } catch(e) {
console.log("No redis-server to connect to.."); console.log("No redis-server to connect to..");
} }
socketIO.listen(server); socketIO.listen(client_server);
} else { } else {
socketIO.listen(server); socketIO.listen(client_server);
} }
process.on('message', function(message, connection) { process.on('message', function(message, connection) {
if (message !== 'sticky-session:connection') { if (message !== 'sticky-session:connection') {
return; return;
} }
server.emit('connection', connection); client_server.emit('connection', connection);
connection.resume(); connection.resume();
}); });