mirror of
https://github.com/viq/NewsBlur.git
synced 2025-08-05 16:49:45 +00:00
Updating to latest mongodb for nodejs lib.
This commit is contained in:
parent
f8028c316c
commit
332a9a55ca
3 changed files with 13 additions and 36 deletions
3
fabfile.py
vendored
3
fabfile.py
vendored
|
@ -748,8 +748,7 @@ def setup_staging():
|
||||||
run('touch logs/newsblur.log')
|
run('touch logs/newsblur.log')
|
||||||
|
|
||||||
def setup_node_app():
|
def setup_node_app():
|
||||||
sudo('add-apt-repository -y ppa:chris-lea/node.js')
|
sudo('curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash -')
|
||||||
sudo('apt-get update')
|
|
||||||
sudo('apt-get install -y nodejs')
|
sudo('apt-get install -y nodejs')
|
||||||
run('curl -L https://npmjs.org/install.sh | sudo sh')
|
run('curl -L https://npmjs.org/install.sh | sudo sh')
|
||||||
sudo('npm install -g supervisor')
|
sudo('npm install -g supervisor')
|
||||||
|
|
|
@ -16,20 +16,13 @@ else
|
||||||
console.log " ---> Running as production server"
|
console.log " ---> Running as production server"
|
||||||
|
|
||||||
if DEV
|
if DEV
|
||||||
server = new mongo.Server(MONGODB_SERVER, MONGODB_PORT,
|
url = "mongodb://#{MONGODB_SERVER}:#{MONGODB_PORT}/newsblur"
|
||||||
auto_reconnect: true
|
|
||||||
poolSize: 12)
|
|
||||||
else
|
else
|
||||||
server = new mongo.ReplSetServers(
|
url = "mongodb://#{MONGODB_SERVER}:#{MONGODB_PORT}/newsblur?replicaSet=nbset&readPreference=secondaryPreferred"
|
||||||
[new mongo.Server( MONGODB_SERVER, MONGODB_PORT, { auto_reconnect: true } )]
|
|
||||||
{rs_name: 'nbset'})
|
|
||||||
|
|
||||||
db = new mongo.Db('newsblur', server,
|
mongo.MongoClient.connect url, (err, db) =>
|
||||||
readPreference: mongo.ReadPreference.SECONDARY_PREFERRED
|
console.log " ---> Connected to #{db} / #{err}"
|
||||||
safe: false)
|
@collection = db.collection "feed_icons"
|
||||||
|
|
||||||
db.open (err, client) =>
|
|
||||||
client.collection "feed_icons", (err, @collection) =>
|
|
||||||
|
|
||||||
app.get /\/rss_feeds\/icon\/(\d+)\/?/, (req, res) =>
|
app.get /\/rss_feeds\/icon\/(\d+)\/?/, (req, res) =>
|
||||||
feed_id = parseInt(req.params[0], 10)
|
feed_id = parseInt(req.params[0], 10)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// Generated by CoffeeScript 1.8.0
|
// Generated by CoffeeScript 1.8.0
|
||||||
(function() {
|
(function() {
|
||||||
var DEV, MONGODB_PORT, MONGODB_SERVER, app, db, mongo, server;
|
var DEV, MONGODB_PORT, MONGODB_SERVER, app, mongo, server, url;
|
||||||
|
|
||||||
app = require('express')();
|
app = require('express')();
|
||||||
|
|
||||||
|
@ -26,30 +26,15 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DEV) {
|
if (DEV) {
|
||||||
server = new mongo.Server(MONGODB_SERVER, MONGODB_PORT, {
|
url = "mongodb://" + MONGODB_SERVER + ":" + MONGODB_PORT + "/newsblur";
|
||||||
auto_reconnect: true,
|
|
||||||
poolSize: 12
|
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
server = new mongo.ReplSetServers([
|
url = "mongodb://" + MONGODB_SERVER + ":" + MONGODB_PORT + "/newsblur?replicaSet=nbset&readPreference=secondaryPreferred";
|
||||||
new mongo.Server(MONGODB_SERVER, MONGODB_PORT, {
|
|
||||||
auto_reconnect: true
|
|
||||||
})
|
|
||||||
], {
|
|
||||||
rs_name: 'nbset'
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
db = new mongo.Db('newsblur', server, {
|
mongo.MongoClient.connect(url, (function(_this) {
|
||||||
readPreference: mongo.ReadPreference.SECONDARY_PREFERRED,
|
return function(err, db) {
|
||||||
safe: false
|
console.log(" ---> Connected to " + db + " / " + err);
|
||||||
});
|
return _this.collection = db.collection("feed_icons");
|
||||||
|
|
||||||
db.open((function(_this) {
|
|
||||||
return function(err, client) {
|
|
||||||
return client.collection("feed_icons", function(err, collection) {
|
|
||||||
_this.collection = collection;
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
})(this));
|
})(this));
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue