Merge to head

lib/memjs/memjs.js

@@ -82,12 +82,33 @@ Client.create = function(serversStr, options) {
   return new Client(servers, options);
 };
 
+// An overridable method you can use for determing
+// server selection. Should return the server index
+// in the list of servers on Client#servers.
+// 
+//   Example using node-hashring:
+//   ~~~~
+//   const memjs = require('memjs');
+//   const HashRing = require('node-hashring');
+//   const servers = ['localhost:11211', 'localhost:11212'];
+//   // build a map of server addresses to their index in the server list
+//   const serverMap = {};
+//   servers.forEach((server, index) => serverMap[server] = index);
+//   const client = memjs.Client.create(servers.join(','));
+//   // build the hashring
+//   const hashRing = new HashRing(servers);
+//   // override the getServer method
+//   client.getServer = (key) => serverMap[hashRing.findNode(key)];
+//   ~~~~
+Client.prototype.getServer = function(key) {
+  return hashCode(key) % this.servers.length;
+};
+
 // Chooses the server to talk to by hashing the given key.
 Client.prototype.server = function(key) {
-  // TODO(alevy): should use consistent hashing and/or allow swapping hashing
   // mechanisms
   var total = this.servers.length;
-  var origIdx = (total > 1) ? (hashCode(key) % total) : 0;
+  var origIdx = total > 1 ? this.getServer(key) : 0;
   var idx = origIdx;
   var serv = this.servers[idx];
   while (serv.wakeupAt &&

lib/memjs/server.js

@@ -150,13 +150,16 @@ Server.prototype.sock = function(sasl, go) {
 
     // setup error handler
     self._socket.on('error', function(error) {
+      self.error(error);
+    });
+
+    self._socket.on('close', function() {
       self.connected = false;
       if (self.timeoutSet) {
         self._socket.setTimeout(0);
         self.timeoutSet = false;
       }
       self._socket = undefined;
-      self.error(error);
     });
 
     // setup connection timeout handler

package.json

@@ -2,7 +2,7 @@
   "author": "Amit Levy",
   "name": "memjs",
   "description": "A memcache client for node using the binary protocol and SASL authentication",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "license": "MIT",
   "homepage": "http://github.com/memcachier/memjs",
   "keywords": [