Merge pull request #31 from 10gen/INT-160

fix(server) INT-160 Scout does not work with WiredTiger

Author: imlucas

scout-server/lib/routes/instance.js

@@ -6,6 +6,7 @@ var boom = require('boom'),
   async = require('async'),
   models = require('../models'),
   types = models.types,
+  debug = require('debug')('scout-server:routes:instance'),
   _ = require('underscore');
 
 module.exports = {
@@ -67,15 +68,12 @@ function getAllCollections(req, fn) {
     var tasks = names.map(function(name) {
       return function(cb) {
         req.mongo.db(name)
-        .collection('system.namespaces')
-        .find()
+        .listCollections()
         .toArray(function(err, data) {
           if (err) return fn(err);
 
-          var names = data.filter(function(ns) {
-            return !(ns.name.indexOf('$') >= 0 && ns.name.indexOf('.oplog.$') < 0);
-          }).map(function(doc) {
-            var ns = types.ns(doc.name);
+          var names = data.map(function(doc) {
+            var ns = types.ns(name +'.'+ doc.name);
             return {
               _id: ns.toString(),
               name: ns.collection,

scout-server/package.json

@@ -37,7 +37,7 @@
     "jsonwebtoken": "^5.0.0",
     "lodash": "^3.6.0",
     "lynx": "^0.2.0",
-    "mongodb": "^2.0.27",
+    "mongodb": "^2.0.33",
     "mongodb-extended-json": "^1.1.2",
     "mongodb-log": "^1.2.5",
     "mongodb-ns": "^1.0.0",