updated mongodb-core to 1.3.13 and version to 2.1.14

Author: christkv

HISTORY.md

@@ -1,3 +1,8 @@
+2.1.14 2016-03-29
+-----------------
+* Updated mongodb-core to 1.3.13.
+* Handle missing cursor on getMore when going through a mongos proxy by pinning to socket connection and not server.
+
 2.1.13 2016-03-29
 -----------------
 * Updated mongodb-core to 1.3.12.

lib/apm.js

@@ -27,7 +27,7 @@ var basicTimestampGenerator = {
  current: function() {
  return new Date().getTime();
  },
- 
+
  duration: function(start, end) {
  return end - start;
  }
@@ -59,7 +59,7 @@ var Instrumentation = function(core, options, callback) {
  var instrumentations = []
 
  // Classes to support
- var classes = [GridStore, OrderedBulkOperation, UnorderedBulkOperation, 
+ var classes = [GridStore, OrderedBulkOperation, UnorderedBulkOperation,
  CommandCursor, AggregationCursor, Cursor, Collection, Db];
 
  // Add instrumentations to the available list
@@ -165,7 +165,7 @@ var Instrumentation = function(core, options, callback) {
  commandObj.ordered = options.ordered != undefined ? options.ordered : true;
  } else if(x == 'insert' || x == 'update' || x == 'remove' && this.lastIsMaster().maxWireVersion >= 2) {
  // Skip the insert/update/remove commands as they are executed as actual write commands in 2.6 or higher
- return func.apply(this, args); 
+ return func.apply(this, args);
  }
 
  // Get the callback
@@ -176,7 +176,7 @@ var Instrumentation = function(core, options, callback) {
 
  // Get a connection reference for this server instance
  var connection = this.s.pool.get()
- 
+
  // Emit the start event for the command
  var command = {
  // Returns the command.
@@ -229,7 +229,7 @@ var Instrumentation = function(core, options, callback) {
  }
 
  self.emit('failed', command);
- } else if(commandObj && commandObj.writeConcern 
+ } else if(commandObj && commandObj.writeConcern
  && commandObj.writeConcern.w == 0) {
  // If we have write concern 0
  command.reply = {ok:1};
@@ -425,7 +425,7 @@ var Instrumentation = function(core, options, callback) {
 
  // Set up the connection
  var connectionId = null;
- 
+
  // Set local connection
  if(this.connection) connectionId = this.connection;
  if(!connectionId && this.server && this.server.getConnection) connectionId = this.server.getConnection();
@@ -465,8 +465,8 @@ var Instrumentation = function(core, options, callback) {
  self.emit('started', command)
 
  // Emit succeeded event with killcursor if we have a legacy protocol
- if(command.commandName == 'killCursors' 
- && this.server.lastIsMaster() 
+ if(command.commandName == 'killCursors'
+ && this.server.lastIsMaster()
  && this.server.lastIsMaster().maxWireVersion < 4) {
  // Emit the succeeded command
  var command = {
@@ -497,7 +497,6 @@ var Instrumentation = function(core, options, callback) {
  // Emit the command
  self.emit('failed', command)
  } else {
-
  // Do we have a getMore
  if(commandName.toLowerCase() == 'getmore' && r == null) {
  r = {
@@ -517,7 +516,7 @@ var Instrumentation = function(core, options, callback) {
  }
  } else if(commandName.toLowerCase() == 'killcursors' && r == null) {
  r = {
- cursorsUnknown:[cursor.cursorState.lastCursorId], 
+ cursorsUnknown:[cursor.cursorState.lastCursorId],
  ok:1
  }
  }
@@ -538,7 +537,7 @@ var Instrumentation = function(core, options, callback) {
 
  // Return
  if(!callback) return;
- 
+
  // Return to caller
  callback(err, r);
  });
@@ -605,4 +604,4 @@ Instrumentation.prototype.uninstrument = function() {
  this.removeAllListeners('failed');
 }
 
-module.exports = Instrumentation;
+module.exports = Instrumentation;

package.json

@@ -1,6 +1,6 @@
 {
  "name": "mongodb",
- "version": "2.1.13",
+ "version": "2.1.14",
  "description": "The official MongoDB driver for Node.js",
  "main": "index.js",
  "repository": {
@@ -14,7 +14,7 @@
  ],
  "dependencies": {
  "es6-promise": "3.0.2",
- "mongodb-core": "1.3.12",
+ "mongodb-core": "1.3.13",
  "readable-stream": "1.0.31"
  },
  "devDependencies": {