github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-15 05:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

make redis client list dynamic based on settings

Browse source
This commit is contained in:
Brian Gough 2019-07-09 11:45:00 +01:00
parent b5f9bc422b
commit cb289f2dec
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/real-time/app/coffee/DocumentUpdaterController.coffee
View file

@ -1,6 +1,6 @@
logger = require "logger-sharelatex"
settings = require 'settings-sharelatex'
redis = require("redis-sharelatex")
RedisClientManager = require "./RedisClientManager"
SafeJsonParse = require "./SafeJsonParse"
EventLogger = require "./EventLogger"
HealthCheckManager = require "./HealthCheckManager"
@ -11,7 +11,7 @@ MESSAGE_SIZE_LOG_LIMIT = 1024 * 1024 # 1Mb
module.exports = DocumentUpdaterController =
# DocumentUpdaterController is responsible for updates that come via Redis
# Pub/Sub from the document updater.
rclientList: [redis.createClient(settings.redis.pubsub)]
rclientList: RedisClientManager.createClientList(settings.redis.pubsub, settings.redis.unusedpubsub)
listenForUpdatesFromDocumentUpdater: (io) ->
for rclient in @rclientList

7
services/real-time/app/coffee/RedisClientManager.coffee Normal file
View file

@ -0,0 +1,7 @@
redis = require("redis-sharelatex")
modules.export = RedisClientManager =
createClientList: (configs...)
# create a dynamic list of redis clients, excluding any configurations which are not defined
clientList = (redis.createClient(x) for x in configs when x?))
return clientList

6
services/real-time/app/coffee/WebsocketLoadBalancer.coffee
View file

@ -1,13 +1,13 @@
Settings = require 'settings-sharelatex'
logger = require 'logger-sharelatex'
redis = require("redis-sharelatex")
RedisClientManager = require "./RedisClientManager"
SafeJsonParse = require "./SafeJsonParse"
EventLogger = require "./EventLogger"
HealthCheckManager = require "./HealthCheckManager"
module.exports = WebsocketLoadBalancer =
rclientPubList: [redis.createClient(Settings.redis.pubsub)]
rclientSubList: [redis.createClient(Settings.redis.pubsub)]
rclientPubList: RedisClientManager.createClientList(Settings.redis.pubsub, Settings.redis.unusedpubsub)
rclientSubList: RedisClientManager.createClientList(Settings.redis.pubsub, Settings.redis.unusedpubsub)
emitToRoom: (room_id, message, payload...) ->
if !room_id?