From 689a75f39703a523721ff53841c40417df701e22 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 9 Jul 2019 14:18:39 +0100 Subject: [PATCH] add logging for redis clients at start up --- .../app/coffee/DocumentUpdaterController.coffee | 1 + .../real-time/app/coffee/RedisClientManager.coffee | 13 ++++++++++++- .../app/coffee/WebsocketLoadBalancer.coffee | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/services/real-time/app/coffee/DocumentUpdaterController.coffee b/services/real-time/app/coffee/DocumentUpdaterController.coffee index 7ee05e3030..b3706f47ba 100644 --- a/services/real-time/app/coffee/DocumentUpdaterController.coffee +++ b/services/real-time/app/coffee/DocumentUpdaterController.coffee @@ -14,6 +14,7 @@ module.exports = DocumentUpdaterController = rclientList: RedisClientManager.createClientList(settings.redis.pubsub, settings.redis.unusedpubsub) listenForUpdatesFromDocumentUpdater: (io) -> + logger.log {rclients: @rclientList.length}, "listening for applied-ops events" for rclient, i in @rclientList rclient.subscribe "applied-ops" rclient.on "message", (channel, message) -> diff --git a/services/real-time/app/coffee/RedisClientManager.coffee b/services/real-time/app/coffee/RedisClientManager.coffee index 01136f14ac..1d573df9b8 100644 --- a/services/real-time/app/coffee/RedisClientManager.coffee +++ b/services/real-time/app/coffee/RedisClientManager.coffee @@ -1,7 +1,18 @@ redis = require("redis-sharelatex") +logger = require 'logger-sharelatex' module.exports = 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?) + clientList = for x in configs when x? + redisType = if x.cluster? + "cluster" + else if x.sentinels? + "sentinel" + else if x.host? + "single" + else + "unknown" + logger.log {redis: redisType}, "creating redis client" + redis.createClient(x) return clientList \ No newline at end of file diff --git a/services/real-time/app/coffee/WebsocketLoadBalancer.coffee b/services/real-time/app/coffee/WebsocketLoadBalancer.coffee index 7e2b8ec82a..10f0c0c646 100644 --- a/services/real-time/app/coffee/WebsocketLoadBalancer.coffee +++ b/services/real-time/app/coffee/WebsocketLoadBalancer.coffee @@ -25,6 +25,8 @@ module.exports = WebsocketLoadBalancer = @emitToRoom "all", message, payload... listenForEditorEvents: (io) -> + logger.log {rclients: @rclientPubList.length}, "publishing editor events" + logger.log {rclients: @rclientSubList.length}, "listening for editor events" for rclientSub in @rclientSubList rclientSub.subscribe "editor-events" rclientSub.on "message", (channel, message) ->