jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/api-v1.5.5' into dev

Browse source
This commit is contained in:
Taha Yassine Kraiem 2022-04-22 16:01:06 +02:00
commit 50db80808f
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ee/utilities/server.js
View file

@ -1,9 +1,9 @@
require('dotenv').config()
const dumps = require('./utils/HeapSnapshot');
const {request_logger} = require('./utils/helper');
const express = require('express');
let socket;
if (process.env.redis === "true") {
console.log("Using Redis");
socket = require("./servers/websocket-cluster");
} else {
socket = require("./servers/websocket");

17
ee/utilities/servers/websocket-cluster.js
View file

@ -18,7 +18,7 @@ const SESSION_RECONNECTED = "SESSION_RECONNECTED";
const REDIS_URL = process.env.REDIS_URL || "redis://localhost:6379";
const pubClient = createClient({url: REDIS_URL});
const subClient = pubClient.duplicate();
console.log(`Using Redis: ${REDIS_URL}`);
let io;
const debug = process.env.debug === "1" || false;
@ -389,11 +389,16 @@ module.exports = {
console.error(e);
}
}, 20000, io);
Promise.all([pubClient.connect(), subClient.connect()]).then(() => {
io.adapter(createAdapter(pubClient, subClient));
console.log("> redis connected.");
// io.listen(3000);
});
Promise.all([pubClient.connect(), subClient.connect()])
.then(() => {
io.adapter(createAdapter(pubClient, subClient));
console.log("> redis connected.");
})
.catch((err) => {
console.log("> redis connection error");
console.error(err);
process.exit(2);
});
},
handlers: {
socketsList,