소스 검색

Update config for websessions

James Allen 9 년 전
부모
커밋
01d0b63f2c
2개의 변경된 파일과 7개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 8
      services/real-time/app.coffee
  2. 6 1
      services/real-time/config/settings.defaults.coffee

+ 1 - 8
services/real-time/app.coffee

@@ -4,16 +4,9 @@ logger.initialize("real-time-sharelatex")
 express = require("express")
 express = require("express")
 session = require("express-session")
 session = require("express-session")
 redis = require("redis-sharelatex")
 redis = require("redis-sharelatex")
-ioredis = require('ioredis')
 Settings = require "settings-sharelatex"
 Settings = require "settings-sharelatex"
 
 
-redisSessionsSettings = Settings.redis.websessions or Settings.redis.web
-
-if redisSessionsSettings?.cluster?
-	logger.log {}, "using redis cluster for web sessions"
-	sessionRedisClient = new ioredis.Cluster(redisSessionsSettings.cluster)
-else
-	sessionRedisClient = redis.createClient(redisSessionsSettings)
+sessionRedisClient = redis.createClient(Settings.redis.websessions)
 
 
 RedisStore = require('connect-redis')(session)
 RedisStore = require('connect-redis')(session)
 SessionSockets = require('session.socket.io')
 SessionSockets = require('session.socket.io')

+ 6 - 1
services/real-time/config/settings.defaults.coffee

@@ -14,7 +14,12 @@ module.exports =
 			password: ""
 			password: ""
 			key_schema:
 			key_schema:
 				pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
 				pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
-			
+
+		websessions:
+			host: "localhost"
+			port: "6379"
+			password: ""
+
 	internal:
 	internal:
 		realTime:
 		realTime:
 			port: 3026
 			port: 3026