mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
Adding docker to node scripts.
This commit is contained in:
parent
678610208b
commit
a0f157dd97
2 changed files with 35 additions and 35 deletions
|
@ -1,6 +1,6 @@
|
||||||
// Generated by CoffeeScript 2.5.1
|
// Generated by CoffeeScript 2.5.1
|
||||||
(function() {
|
(function() {
|
||||||
var DEV, MONGODB_PORT, MONGODB_SERVER, app, log, mongo, server, url;
|
var DEV, DOCKER, MONGODB_PORT, MONGODB_SERVER, app, log, mongo, server, url;
|
||||||
|
|
||||||
app = require('express')();
|
app = require('express')();
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DEV || DOCKER) {
|
if (DEV || DOCKER) {
|
||||||
url = "mongodb://" + MONGODB_SERVER + ":" + MONGODB_PORT + "/newsblur";
|
url = `mongodb://${MONGODB_SERVER}:${MONGODB_PORT}/newsblur`;
|
||||||
} else {
|
} else {
|
||||||
url = `mongodb://${MONGODB_SERVER}:${MONGODB_PORT}/newsblur?replicaSet=nbset&readPreference=secondaryPreferred`;
|
url = `mongodb://${MONGODB_SERVER}:${MONGODB_PORT}/newsblur?replicaSet=nbset&readPreference=secondaryPreferred`;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// Generated by CoffeeScript 2.5.1
|
// Generated by CoffeeScript 2.5.1
|
||||||
(function() {
|
(function() {
|
||||||
var DEV, DOCKER, REDIS_SERVER, SECURE, app, certificate, fs, io, log, options, privateKey, redis;
|
var DEV, DOCKER, REDIS_PORT, REDIS_SERVER, SECURE, app, certificate, fs, io, log, options, privateKey, redis;
|
||||||
|
|
||||||
fs = require('fs');
|
fs = require('fs');
|
||||||
|
|
||||||
|
@ -13,11 +13,17 @@
|
||||||
DOCKER = process.env.NODE_ENV === 'docker';
|
DOCKER = process.env.NODE_ENV === 'docker';
|
||||||
|
|
||||||
REDIS_SERVER = process.env.NODE_ENV === 'development' ? 'localhost' : DOCKER ? 'redis' : 'db_redis_pubsub';
|
REDIS_SERVER = process.env.NODE_ENV === 'development' ? 'localhost' : DOCKER ? 'redis' : 'db_redis_pubsub';
|
||||||
|
|
||||||
SECURE = !!process.env.NODE_SSL;
|
SECURE = !!process.env.NODE_SSL;
|
||||||
|
|
||||||
REDIS_PORT = DOCKER ? 6579 : 6379;
|
REDIS_PORT = DOCKER ? 6579 : 6379;
|
||||||
|
|
||||||
|
// client = redis.createClient 6379, REDIS_SERVER
|
||||||
|
|
||||||
|
// RedisStore = require 'socket.io/lib/stores/redis'
|
||||||
|
// rpub = redis.createClient 6379, REDIS_SERVER
|
||||||
|
// rsub = redis.createClient 6379, REDIS_SERVER
|
||||||
|
// rclient = redis.createClient 6379, REDIS_SERVER
|
||||||
log.debug("Starting NewsBlur unread count server...");
|
log.debug("Starting NewsBlur unread count server...");
|
||||||
|
|
||||||
if (!DEV && !process.env.NODE_ENV) {
|
if (!DEV && !process.env.NODE_ENV) {
|
||||||
|
@ -80,37 +86,31 @@
|
||||||
ref.quit();
|
ref.quit();
|
||||||
}
|
}
|
||||||
socket.subscribe = redis.createClient(REDIS_PORT, REDIS_SERVER);
|
socket.subscribe = redis.createClient(REDIS_PORT, REDIS_SERVER);
|
||||||
socket.subscribe.on("error", (function(_this) {
|
socket.subscribe.on("error", (err) => {
|
||||||
return function(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.subscribe) != null ? ref1.quit() : void 0;
|
||||||
return (_ref1 = socket.subscribe) != null ? _ref1.quit() : void 0;
|
});
|
||||||
};
|
socket.subscribe.on("connect", () => {
|
||||||
})(this));
|
var feeds_story;
|
||||||
socket.subscribe.on("connect", (function(_this) {
|
log.info(this.username, `Connected (${this.feeds.length} feeds, ${ip}),` + ` (${io.engine.clientsCount} connected) ` + ` ${SECURE ? "(SSL)" : "(non-SSL)"}`);
|
||||||
return function() {
|
socket.subscribe.subscribe(this.feeds);
|
||||||
var feeds_story;
|
feeds_story = this.feeds.map(function(f) {
|
||||||
log.info(_this.username, ("Connected (" + _this.feeds.length + " feeds, " + ip + "),") + (" (" + io.engine.clientsCount + " connected) ") + (" " + (SECURE ? "(SSL)" : "(non-SSL)")));
|
return `${f}:story`;
|
||||||
socket.subscribe.subscribe(_this.feeds);
|
});
|
||||||
feeds_story = _this.feeds.map(function(f) {
|
socket.subscribe.subscribe(feeds_story);
|
||||||
return "" + f + ":story";
|
return socket.subscribe.subscribe(this.username);
|
||||||
});
|
});
|
||||||
socket.subscribe.subscribe(feeds_story);
|
return socket.subscribe.on('message', (channel, message) => {
|
||||||
return socket.subscribe.subscribe(_this.username);
|
log.info(this.username, `Update on ${channel}: ${message}`);
|
||||||
};
|
if (channel === this.username) {
|
||||||
})(this));
|
return socket.emit('user:update', channel, message);
|
||||||
return socket.subscribe.on('message', (function(_this) {
|
} else if (channel.indexOf(':story') >= 0) {
|
||||||
return function(channel, message) {
|
return socket.emit('feed:story:new', channel, message);
|
||||||
log.info(_this.username, "Update on " + channel + ": " + message);
|
} else {
|
||||||
if (channel === _this.username) {
|
return socket.emit('feed:update', channel, message);
|
||||||
return socket.emit('user:update', channel, message);
|
}
|
||||||
} else if (channel.indexOf(':story') >= 0) {
|
});
|
||||||
return socket.emit('feed:story:new', channel, message);
|
|
||||||
} else {
|
|
||||||
return socket.emit('feed:update', channel, message);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
})(this));
|
|
||||||
});
|
});
|
||||||
return socket.on('disconnect', () => {
|
return socket.on('disconnect', () => {
|
||||||
var ref, ref1;
|
var ref, ref1;
|
||||||
|
|
Loading…
Add table
Reference in a new issue