IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

socket.io:delete redis in config

Browse Source
This commit is contained in:
Anton Suhorukov 2022-03-09 16:53:36 +03:00
parent 263aa1e8ce
commit 6b262e915a
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/ASC.Socket.IO/config/config.json
View File

@ -1,11 +1,5 @@
{
"port": 9899,
"appsettings": "../../../config",
"environment": "Development",
"redis": {
"enabled": false,
"db": 0,
"pass": "",
"ttl": 84600
}
"environment": "Development"
}

14
common/ASC.Socket.IO/config/index.js
View File

@ -36,12 +36,14 @@ function getAndSaveAppsettings(){
else{
nconf.file("redis", path.join(__dirname, appsettings, 'redis.json'));
}
var hosts = nconf.get("Redis").Hosts;
var redis = nconf.get("redis");
if(hosts && hosts.count > 0)
var redis = nconf.get("Redis");
if(redis != null)
{
redis.host = hosts[0].Host;
redis.port = hosts[0].Port;
nconf.set("redis", redis);
redis.host = redis.Hosts[0].Host;
redis.port = redis.Hosts[0].Port;
redis.connect_timeout = redis.ConnectTimeout;
redis.db = redis.Database;
nconf.set("Redis", redis);
}
}

4
common/ASC.Socket.IO/server.js
View File

@ -24,10 +24,10 @@ const secret = config.get("core").machinekey + new Date().getTime();
const secretCookieParser = cookieParser(secret);
const baseCookieParser = cookieParser();
const redisOptions = config.get("redis");
const redisOptions = config.get("Redis");
let store;
if (redisOptions?.enabled) {
if (redisOptions != null) {
const redisClient = redis.createClient(redisOptions);
store = new RedisStore({ client: redisClient });
} else {