From 332a9a55ca2be62c61c4c0e4be7c7f9e63ab8d6a Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 30 Nov 2016 12:29:24 -0800
Subject: [PATCH] Updating to latest mongodb for nodejs lib.

---
 fabfile.py           |  3 +--
 node/favicons.coffee | 17 +++++------------
 node/favicons.js     | 29 +++++++----------------------
 3 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/fabfile.py b/fabfile.py
index 0b58ca3f4..c80868423 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -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')
diff --git a/node/favicons.coffee b/node/favicons.coffee
index 129dd780a..57691dbe0 100644
--- a/node/favicons.coffee
+++ b/node/favicons.coffee
@@ -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)
diff --git a/node/favicons.js b/node/favicons.js
index e8e81a9a8..0f23b837e 100644
--- a/node/favicons.js
+++ b/node/favicons.js
@@ -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));