public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-08-05 16:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating to latest mongodb for nodejs lib.

Browse source
This commit is contained in:
Samuel Clay 2016-11-30 12:29:24 -08:00
parent f8028c316c
commit 332a9a55ca
3 changed files with 13 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fabfile.py vendored
View file

@ -748,8 +748,7 @@ def setup_staging():
run('touch logs/newsblur.log')
def setup_node_app():
sudo('add-apt-repository -y ppa:chris-lea/node.js')
sudo('apt-get update')
sudo('curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash -')
sudo('apt-get install -y nodejs')
run('curl -L https://npmjs.org/install.sh | sudo sh')
sudo('npm install -g supervisor')

17
node/favicons.coffee
View file

@ -16,20 +16,13 @@ else
console.log " ---> Running as production server"
if DEV
server = new mongo.Server(MONGODB_SERVER, MONGODB_PORT,
auto_reconnect: true
poolSize: 12)
url = "mongodb://#{MONGODB_SERVER}:#{MONGODB_PORT}/newsblur"
else
server = new mongo.ReplSetServers(
[new mongo.Server( MONGODB_SERVER, MONGODB_PORT, { auto_reconnect: true } )]
{rs_name: 'nbset'})
url = "mongodb://#{MONGODB_SERVER}:#{MONGODB_PORT}/newsblur?replicaSet=nbset&readPreference=secondaryPreferred"
db = new mongo.Db('newsblur', server,
readPreference: mongo.ReadPreference.SECONDARY_PREFERRED
safe: false)
db.open (err, client) =>
client.collection "feed_icons", (err, @collection) =>
mongo.MongoClient.connect url, (err, db) =>
console.log " ---> Connected to #{db} / #{err}"
@collection = db.collection "feed_icons"
app.get /\/rss_feeds\/icon\/(\d+)\/?/, (req, res) =>
feed_id = parseInt(req.params[0], 10)

29
node/favicons.js
View file

@ -1,6 +1,6 @@
// Generated by CoffeeScript 1.8.0
(function() {
var DEV, MONGODB_PORT, MONGODB_SERVER, app, db, mongo, server;
var DEV, MONGODB_PORT, MONGODB_SERVER, app, mongo, server, url;
app = require('express')();
@ -26,30 +26,15 @@
}
if (DEV) {
server = new mongo.Server(MONGODB_SERVER, MONGODB_PORT, {
auto_reconnect: true,
poolSize: 12
});
url = "mongodb://" + MONGODB_SERVER + ":" + MONGODB_PORT + "/newsblur";
} else {
server = new mongo.ReplSetServers([
new mongo.Server(MONGODB_SERVER, MONGODB_PORT, {
auto_reconnect: true
})
], {
rs_name: 'nbset'
});
url = "mongodb://" + MONGODB_SERVER + ":" + MONGODB_PORT + "/newsblur?replicaSet=nbset&readPreference=secondaryPreferred";
}
db = new mongo.Db('newsblur', server, {
readPreference: mongo.ReadPreference.SECONDARY_PREFERRED,
safe: false
});
db.open((function(_this) {
return function(err, client) {
return client.collection("feed_icons", function(err, collection) {
_this.collection = collection;
});
mongo.MongoClient.connect(url, (function(_this) {
return function(err, db) {
console.log(" ---> Connected to " + db + " / " + err);
return _this.collection = db.collection("feed_icons");
};
})(this));