From 0ed7d0c8118235a124fcab9d221a0e611b12d2e2 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 24 Nov 2014 12:09:12 +0000 Subject: [PATCH] Ignore messages with null room_id --- services/real-time/app/coffee/WebsocketLoadBalancer.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/real-time/app/coffee/WebsocketLoadBalancer.coffee b/services/real-time/app/coffee/WebsocketLoadBalancer.coffee index 966955f117..385bdef222 100644 --- a/services/real-time/app/coffee/WebsocketLoadBalancer.coffee +++ b/services/real-time/app/coffee/WebsocketLoadBalancer.coffee @@ -1,4 +1,5 @@ Settings = require 'settings-sharelatex' +logger = require 'logger-sharelatex' redis = require("redis-sharelatex") rclientPub = redis.createClient(Settings.redis.web) rclientSub = redis.createClient(Settings.redis.web) @@ -8,6 +9,9 @@ module.exports = WebsocketLoadBalancer = rclientSub: rclientSub emitToRoom: (room_id, message, payload...) -> + if !room_id? + logger.err {err: new Error("Empty room_id"), message, payload}, "error emitting to room" + return @rclientPub.publish "editor-events", JSON.stringify room_id: room_id message: message @@ -25,6 +29,6 @@ module.exports = WebsocketLoadBalancer = message = JSON.parse(message) if message.room_id == "all" io.sockets.emit(message.message, message.payload...) - else + else if message.room_id? io.sockets.in(message.room_id).emit(message.message, message.payload...)