From 93fb81150e3ae428907eb36f77800bb2bb99bc35 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Mon, 5 Dec 2016 12:46:09 -0800 Subject: [PATCH 1/2] Reloading feeds when adding a subscription. --- apps/reader/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/reader/models.py b/apps/reader/models.py index a9ef90813..51a6908ce 100644 --- a/apps/reader/models.py +++ b/apps/reader/models.py @@ -384,6 +384,10 @@ class UserSubscription(models.Model): feed.setup_feed_for_premium_subscribers() feed.count_subscribers() + + r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL) + r.publish(user.username, 'reload:feeds') + return code, message, us From b222ee06d0de5b50cca4d43d1eadc5e34e59fe83 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Mon, 5 Dec 2016 13:35:05 -0800 Subject: [PATCH 2/2] Attempting to add logging to socket.io. --- node/unread_counts.coffee | 5 ++++- node/unread_counts.js | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/node/unread_counts.coffee b/node/unread_counts.coffee index 7078f26b1..e26d8a244 100644 --- a/node/unread_counts.coffee +++ b/node/unread_counts.coffee @@ -53,8 +53,11 @@ io.on 'connection', (socket) -> socket.subscribe = redis.createClient 6379, REDIS_SERVER socket.subscribe.on "error", (err) -> console.log " ---> Error: #{err}" - socket.subscribe.quit() + socket.subscribe?.quit() socket.subscribe.on "connect", => + log.info @username, "Connected (#{@feeds.length} feeds, #{ip})," + + " (#{io.engine.clientsCount} connected) " + + " #{if SECURE then "(SSL)" else "(non-SSL)"}" socket.subscribe.subscribe @feeds socket.subscribe.subscribe @username diff --git a/node/unread_counts.js b/node/unread_counts.js index 2ddfb0a92..fe185986f 100644 --- a/node/unread_counts.js +++ b/node/unread_counts.js @@ -55,11 +55,13 @@ } socket.subscribe = redis.createClient(6379, REDIS_SERVER); socket.subscribe.on("error", function(err) { + var _ref1; console.log(" ---> Error: " + err); - return socket.subscribe.quit(); + return (_ref1 = socket.subscribe) != null ? _ref1.quit() : void 0; }); socket.subscribe.on("connect", (function(_this) { return function() { + log.info(_this.username, ("Connected (" + _this.feeds.length + " feeds, " + ip + "),") + (" (" + io.engine.clientsCount + " connected) ") + (" " + (SECURE ? "(SSL)" : "(non-SSL)"))); socket.subscribe.subscribe(_this.feeds); return socket.subscribe.subscribe(_this.username); };