mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-04-13 09:42:01 +00:00
Don't know why this didn't take
This commit is contained in:
parent
da3643c24d
commit
1c26ec2ce4
3 changed files with 21 additions and 21 deletions
|
@ -13,7 +13,7 @@
|
||||||
version: dashboard3
|
version: dashboard3
|
||||||
register: pulled
|
register: pulled
|
||||||
|
|
||||||
- name: Reload node
|
- name: Restart node
|
||||||
become: yes
|
become: yes
|
||||||
command: "docker restart {{ item.container_name }}"
|
command: "docker restart {{ item.container_name }}"
|
||||||
when: item.target_host in inventory_hostname
|
when: item.target_host in inventory_hostname
|
||||||
|
|
|
@ -55,21 +55,21 @@ unread_counts = (server) =>
|
||||||
|
|
||||||
socket.on "error", (err) ->
|
socket.on "error", (err) ->
|
||||||
log.debug "Error (socket): #{err}"
|
log.debug "Error (socket): #{err}"
|
||||||
socket.client?.quit()
|
socket.subscribe?.quit()
|
||||||
socket.client = redis.createClient REDIS_PORT, REDIS_SERVER
|
socket.subscribe = redis.createClient REDIS_PORT, REDIS_SERVER
|
||||||
socket.client.on "error", (err) =>
|
socket.subscribe.on "error", (err) =>
|
||||||
log.info @username, "Error: #{err} (#{@feeds.length} feeds)"
|
log.info @username, "Error: #{err} (#{@feeds.length} feeds)"
|
||||||
socket.client?.quit()
|
socket.subscribe?.quit()
|
||||||
socket.client.on "connect", =>
|
socket.subscribe.on "connect", =>
|
||||||
log.info @username, "Connected (#{@feeds.length} feeds, #{ip})," +
|
log.info @username, "Connected (#{@feeds.length} feeds, #{ip})," +
|
||||||
" (#{io.engine.clientsCount} connected) " +
|
" (#{io.engine.clientsCount} connected) " +
|
||||||
" #{if SECURE then "(SSL)" else "(non-SSL)"}"
|
" #{if SECURE then "(SSL)" else "(non-SSL)"}"
|
||||||
socket.client.subscribe @feeds
|
socket.subscribe.subscribe @feeds
|
||||||
feeds_story = @feeds.map (f) -> "#{f}:story"
|
feeds_story = @feeds.map (f) -> "#{f}:story"
|
||||||
socket.client.subscribe feeds_story
|
socket.subscribe.subscribe feeds_story
|
||||||
socket.client.subscribe @username
|
socket.subscribe.subscribe @username
|
||||||
|
|
||||||
socket.client.on 'message', (channel, message) =>
|
socket.subscribe.on 'message', (channel, message) =>
|
||||||
event_name = 'feed:update'
|
event_name = 'feed:update'
|
||||||
if channel == @username
|
if channel == @username
|
||||||
event_name = 'user:update'
|
event_name = 'user:update'
|
||||||
|
@ -79,7 +79,7 @@ unread_counts = (server) =>
|
||||||
socket.emit event_name, channel, message
|
socket.emit event_name, channel, message
|
||||||
|
|
||||||
socket.on 'disconnect', () =>
|
socket.on 'disconnect', () =>
|
||||||
socket.client?.quit()
|
socket.subscribe?.quit()
|
||||||
log.info @username, "Disconnect (#{@feeds?.length} feeds, #{ip})," +
|
log.info @username, "Disconnect (#{@feeds?.length} feeds, #{ip})," +
|
||||||
" there are now #{io.engine.clientsCount} users. " +
|
" there are now #{io.engine.clientsCount} users. " +
|
||||||
" #{if SECURE then "(SSL)" else "(non-SSL)"}"
|
" #{if SECURE then "(SSL)" else "(non-SSL)"}"
|
||||||
|
|
|
@ -61,26 +61,26 @@
|
||||||
socket.on("error", function(err) {
|
socket.on("error", function(err) {
|
||||||
return log.debug(`Error (socket): ${err}`);
|
return log.debug(`Error (socket): ${err}`);
|
||||||
});
|
});
|
||||||
if ((ref = socket.client) != null) {
|
if ((ref = socket.subscribe) != null) {
|
||||||
ref.quit();
|
ref.quit();
|
||||||
}
|
}
|
||||||
socket.client = redis.createClient(REDIS_PORT, REDIS_SERVER);
|
socket.subscribe = redis.createClient(REDIS_PORT, REDIS_SERVER);
|
||||||
socket.client.on("error", (err) => {
|
socket.subscribe.on("error", (err) => {
|
||||||
var ref1;
|
var ref1;
|
||||||
log.info(this.username, `Error: ${err} (${this.feeds.length} feeds)`);
|
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;
|
var feeds_story;
|
||||||
log.info(this.username, `Connected (${this.feeds.length} feeds, ${ip}),` + ` (${io.engine.clientsCount} connected) ` + ` ${SECURE ? "(SSL)" : "(non-SSL)"}`);
|
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) {
|
feeds_story = this.feeds.map(function(f) {
|
||||||
return `${f}:story`;
|
return `${f}:story`;
|
||||||
});
|
});
|
||||||
socket.client.subscribe(feeds_story);
|
socket.subscribe.subscribe(feeds_story);
|
||||||
return socket.client.subscribe(this.username);
|
return socket.subscribe.subscribe(this.username);
|
||||||
});
|
});
|
||||||
return socket.client.on('message', (channel, message) => {
|
return socket.subscribe.on('message', (channel, message) => {
|
||||||
var event_name;
|
var event_name;
|
||||||
event_name = 'feed:update';
|
event_name = 'feed:update';
|
||||||
if (channel === this.username) {
|
if (channel === this.username) {
|
||||||
|
@ -94,7 +94,7 @@
|
||||||
});
|
});
|
||||||
return socket.on('disconnect', () => {
|
return socket.on('disconnect', () => {
|
||||||
var ref, ref1;
|
var ref, ref1;
|
||||||
if ((ref = socket.client) != null) {
|
if ((ref = socket.subscribe) != null) {
|
||||||
ref.quit();
|
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)"}`);
|
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)"}`);
|
||||||
|
|
Loading…
Add table
Reference in a new issue