From 6b262e915a58c38b37fe220e0133207373dbcca3 Mon Sep 17 00:00:00 2001
From: SuhorukovAnton <anton.sukhorukov@onlyoffice.com>
Date: Wed, 9 Mar 2022 16:53:36 +0300
Subject: [PATCH] socket.io:delete redis in config

---
 common/ASC.Socket.IO/config/config.json |  8 +-------
 common/ASC.Socket.IO/config/index.js    | 14 ++++++++------
 common/ASC.Socket.IO/server.js          |  4 ++--
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/common/ASC.Socket.IO/config/config.json b/common/ASC.Socket.IO/config/config.json
index 983174d2ba..66a9648ef3 100644
--- a/common/ASC.Socket.IO/config/config.json
+++ b/common/ASC.Socket.IO/config/config.json
@@ -1,11 +1,5 @@
 {
   "port": 9899,
   "appsettings": "../../../config",
-  "environment": "Development",
-  "redis": {
-    "enabled": false,
-    "db": 0,
-    "pass": "",
-    "ttl": 84600
-  }
+  "environment": "Development"
 }
diff --git a/common/ASC.Socket.IO/config/index.js b/common/ASC.Socket.IO/config/index.js
index 2ead56b450..79a1b785a9 100644
--- a/common/ASC.Socket.IO/config/index.js
+++ b/common/ASC.Socket.IO/config/index.js
@@ -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);
     }
 }
\ No newline at end of file
diff --git a/common/ASC.Socket.IO/server.js b/common/ASC.Socket.IO/server.js
index a3869add30..5cb992866b 100644
--- a/common/ASC.Socket.IO/server.js
+++ b/common/ASC.Socket.IO/server.js
@@ -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 {