use mongoClient on connection

manifest.yml

@@ -0,0 +1,5 @@
+applications:
+- name: cla-assistant-staging
+  services:
+  - cla-staging-env
+  - my-logs

package.json

@@ -38,7 +38,7 @@
     "karma-mocha": "^1.1.1",
     "memory-cache": "^0.1.6",
     "merge": "^1.2.0",
-    "mongoose": "^4.5.2",
+    "mongoose": "^4.11",
     "node-sass-middleware": "^0.10.0",
     "passport": "^0.3.2",
     "passport-accesstoken": "^0.1.0",
@@ -80,7 +80,7 @@
     "supertest": "2.0.1"
   },
   "engines": {
-    "node": "6.10.3"
+    "node": "7.10"
   },
   "scripts": {
     "start": "node app.js",

src/server/app.js

@@ -142,15 +142,13 @@ async.series([
         var mongoose = require('mongoose');
 
         mongoose.connect(config.server.mongodb.uri, {
-            server: {
-                socketOptions: {
-                    keepAlive: 1
-                }
-            }
+            useMongoClient: true,
+            keepAlive: true
+        }, (err, db) => {
+            bootstrap('documents', callback);
         });
 
         global.models = {};
-        bootstrap('documents', callback);
     },
 
     function (callback) {
@@ -214,4 +212,4 @@ app.all('/github/webhook/:repo', function (req, res) {
     }
 });
 
-module.exports = app;
+module.exports = app;

src/server/documents/cla.js

@@ -11,7 +11,10 @@ var CLASchema = mongoose.Schema({
     ownerId: String,
     repo: String,
     repoId: String,
-    org_cla: { type: Boolean, default: false },
+    org_cla: {
+        type: Boolean,
+        default: false
+    },
     user: String,
     userId: String,
 });
@@ -30,7 +33,7 @@ var indexOptions = {
 
 var CLA = mongoose.model('CLA', CLASchema);
 
-CLA.collection.dropAllIndexes(function(err, results) {
+CLA.collection.dropAllIndexes(function (err, results) {
     if (err) {
         logger.warn('CLA collection dropAllIndexes error: ', err);
         logger.warn('dropAllIndexes results: ', results);
@@ -40,4 +43,4 @@ CLA.collection.createIndex(index, indexOptions);
 
 module.exports = {
     CLA: CLA
-};
+};

src/server/documents/repo.js

@@ -20,4 +20,4 @@ var Repo = mongoose.model('Repo', RepoSchema);
 
 module.exports = {
     Repo: Repo
-};
+};

src/server/services/repo.js

@@ -70,9 +70,9 @@ var selection = function (args) {
     return args.repoId ? {
         repoId: args.repoId
     } : {
-            repo: args.repo,
-            owner: args.owner
-        };
+        repo: args.repo,
+        owner: args.owner
+    };
 };
 
 module.exports = {
@@ -181,8 +181,8 @@ module.exports = {
                             id: committer.id || ''
                         };
                         if (committers.length === 0 || committers.map(function (c) {
-                            return c.name;
-                        }).indexOf(user.name) < 0) {
+                                return c.name;
+                            }).indexOf(user.name) < 0) {
                             committers.push(user);
                         }
                     });
@@ -191,10 +191,10 @@ module.exports = {
                     if (res && res.message === 'Moved Permanently' && linkedRepo) {
                         self.getGHRepo(args, function (err, res) {
                             if (res && res.id && compareRepoNameAndUpdate(linkedRepo, {
-                                repo: res.name,
-                                owner: res.owner.login,
-                                repoId: res.id
-                            })) {
+                                    repo: res.name,
+                                    owner: res.owner.login,
+                                    repoId: res.id
+                                })) {
                                 arg.arg.repo = res.name;
                                 arg.arg.owner = res.owner.login;
 
@@ -369,4 +369,4 @@ module.exports = {
         };
         github.call(params, done);
     }
-};
+};