diff --git a/ansible/deploy_node.yml b/ansible/deploy_node.yml index 24adb15b0..c642c31aa 100644 --- a/ansible/deploy_node.yml +++ b/ansible/deploy_node.yml @@ -13,7 +13,7 @@ version: dashboard3 register: pulled - - name: Reload node + - name: Restart node become: yes command: "docker restart {{ item.container_name }}" when: item.target_host in inventory_hostname diff --git a/node/unread_counts.coffee b/node/unread_counts.coffee index 7c8d34617..7dac5ad8a 100644 --- a/node/unread_counts.coffee +++ b/node/unread_counts.coffee @@ -55,21 +55,21 @@ unread_counts = (server) => socket.on "error", (err) -> log.debug "Error (socket): #{err}" - socket.client?.quit() - socket.client = redis.createClient REDIS_PORT, REDIS_SERVER - socket.client.on "error", (err) => + socket.subscribe?.quit() + socket.subscribe = redis.createClient REDIS_PORT, REDIS_SERVER + socket.subscribe.on "error", (err) => log.info @username, "Error: #{err} (#{@feeds.length} feeds)" - socket.client?.quit() - socket.client.on "connect", => + 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.client.subscribe @feeds + socket.subscribe.subscribe @feeds feeds_story = @feeds.map (f) -> "#{f}:story" - socket.client.subscribe feeds_story - socket.client.subscribe @username + socket.subscribe.subscribe feeds_story + socket.subscribe.subscribe @username - socket.client.on 'message', (channel, message) => + socket.subscribe.on 'message', (channel, message) => event_name = 'feed:update' if channel == @username event_name = 'user:update' @@ -79,7 +79,7 @@ unread_counts = (server) => socket.emit event_name, channel, message socket.on 'disconnect', () => - socket.client?.quit() + socket.subscribe?.quit() log.info @username, "Disconnect (#{@feeds?.length} feeds, #{ip})," + " there are now #{io.engine.clientsCount} users. " + " #{if SECURE then "(SSL)" else "(non-SSL)"}" diff --git a/node/unread_counts.js b/node/unread_counts.js index 4743223da..e69e99f4d 100644 --- a/node/unread_counts.js +++ b/node/unread_counts.js @@ -61,26 +61,26 @@ socket.on("error", function(err) { return log.debug(`Error (socket): ${err}`); }); - if ((ref = socket.client) != null) { + if ((ref = socket.subscribe) != null) { ref.quit(); } - socket.client = redis.createClient(REDIS_PORT, REDIS_SERVER); - socket.client.on("error", (err) => { + socket.subscribe = redis.createClient(REDIS_PORT, REDIS_SERVER); + socket.subscribe.on("error", (err) => { var ref1; log.info(this.username, `Error: ${err} (${this.feeds.length} feeds)`); - return (ref1 = socket.client) != null ? ref1.quit() : void 0; + return (ref1 = socket.subscribe) != null ? ref1.quit() : void 0; }); - socket.client.on("connect", () => { + socket.subscribe.on("connect", () => { var feeds_story; log.info(this.username, `Connected (${this.feeds.length} feeds, ${ip}),` + ` (${io.engine.clientsCount} connected) ` + ` ${SECURE ? "(SSL)" : "(non-SSL)"}`); - socket.client.subscribe(this.feeds); + socket.subscribe.subscribe(this.feeds); feeds_story = this.feeds.map(function(f) { return `${f}:story`; }); - socket.client.subscribe(feeds_story); - return socket.client.subscribe(this.username); + socket.subscribe.subscribe(feeds_story); + return socket.subscribe.subscribe(this.username); }); - return socket.client.on('message', (channel, message) => { + return socket.subscribe.on('message', (channel, message) => { var event_name; event_name = 'feed:update'; if (channel === this.username) { @@ -94,7 +94,7 @@ }); return socket.on('disconnect', () => { var ref, ref1; - if ((ref = socket.client) != null) { + if ((ref = socket.subscribe) != null) { ref.quit(); } return log.info(this.username, `Disconnect (${(ref1 = this.feeds) != null ? ref1.length : void 0} feeds, ${ip}),` + ` there are now ${io.engine.clientsCount} users. ` + ` ${SECURE ? "(SSL)" : "(non-SSL)"}`);