Improvements on stability.

Author: tanguylebarzic

index.js

@@ -645,7 +645,7 @@ function Command(command, args, sub_command, buffer_args, callback) {
 }
 
 RedisClient.prototype.send_command = function (command, args, callback) {
-    var arg, command_obj, i, il, elem_count, buffer_args, stream = this.stream, command_str = "", buffered_writes = 0, last_arg_type;
+    var arg, command_obj, i, il, elem_count, buffer_args, stream = this.stream, command_str = "", buffered_writes = 0, last_arg_type, self = this;
 
     if (typeof command !== "string") {
         throw new Error("First argument to send_command must be the command name string, not " + typeof command);
@@ -710,7 +710,7 @@ RedisClient.prototype.send_command = function (command, args, callback) {
             if (command_obj.callback) {
                 command_obj.callback(not_writeable_error);
             } else {
-                throw not_writeable_error;
+                return self.emit("error", new Error(not_writeable_error));
             }
         }
 

sentinel.js

@@ -6,8 +6,14 @@ var RedisSingleClient = require("./index");
 
 exports.debug_mode = true;
 
+var states = {
+    NOT_INITIALIZED: 1,
+    HEALTHY: 2,
+    UNHEALTHY: 3
+};
+
 function RedisMetaClient(masterName, startingSentinels) {
-    this.healthy = false;
+    this.state = states.NOT_INITIALIZED;
     this.master = {
         host: null,
         port: null
@@ -34,15 +40,20 @@ function RedisMetaClient(masterName, startingSentinels) {
 
     this.getSentinels(startingSentinels, function(error, sentinelsConfig) {
         if(error) {
+            self.emit('stateChange', states.UNHEALTHY);
             console.log(error);
             return;
         }
 
         self.initSentinelsConnection(sentinelsConfig);
     });
 
-    this.on('healthyChange', function(newState) {
-        this.healthy = newState;
+    this.on('stateChange', function(newState) {
+        console.log("stateChange: " + newState);
+        this.state = newState;
+        if(this.state === states.UNHEALTHY){
+            self.masterUnavailable();
+        }
     });
 
     this.on('masterAvailable', function(availableMaster) {
@@ -213,13 +224,13 @@ RedisMetaClient.prototype.initSentinelConnection = function(sentinelConfig) {
 
         case '+odown':
             if(parts[0] === 'master') {
-                self.emit('healthyChange', false);
+                self.emit('stateChange', states.UNHEALTHY);
             }
             break;
 
         case '-odown':
             if(parts[0] === 'master') {
-                self.emit('healthyChange', true);
+                self.emit('stateChange', states.HEALTHY);
             }
             break;
 
@@ -228,7 +239,7 @@ RedisMetaClient.prototype.initSentinelConnection = function(sentinelConfig) {
 
         case '+failover-triggered':
             if(parts[0] === 'master') {
-                self.emit('healthyChange', false);
+                self.emit('stateChange', states.UNHEALTHY);
             }
             break;
 
@@ -326,6 +337,9 @@ RedisMetaClient.prototype.quit = function(){
 };
 
 RedisMetaClient.prototype.sentinelsConfigured = function() {
+    if(exports.debug_mode){
+        console.log("sentinelsConfigured");
+    }
     this.setupMasterConnection();
 };
 
@@ -366,6 +380,9 @@ RedisMetaClient.prototype.setupMasterConnection = function() {
             if(selectedMaster) {
                 self.emit('masterAvailable', selectedMaster);
             }
+            else {
+                self.emit('stateChange', states.UNHEALTHY);
+            }
         };
 
     var onResultFromSentinel = function(error, result) {
@@ -443,9 +460,18 @@ RedisMetaClient.prototype.masterAvailable = function(availableMaster) {
         masterClient.client.forceReconnectionAttempt();
     });
 
-    this.emit('healthyChange', true);
+    this.emit('stateChange', states.HEALTHY);
 };
 
+RedisMetaClient.prototype.masterUnavailable = function() {
+    console.log("masterUnavailable");
+    this.masterClients.forEach(function(masterClient){
+        masterClient.client.flush_and_error("Master not available");
+        masterClient.client.enable_offline_queue = false;
+    });
+};
+
+
 // Return a RedisSingleCLient pointing to the master (or to nothing if there is no master yet)
 RedisMetaClient.prototype.createMasterClient = function(options) {
     options = options || {};