Fail gracefully when the Redis limiter isn't ready

bottleneck.js

@@ -882,6 +882,7 @@
         client: this.client,
         subscriber: this.subClient
       };
+      this.isReady = false;
       this.ready = new this.Promise((resolve, reject) => {
         var count, done, errorListener;
         errorListener = function(e) {
@@ -926,6 +927,7 @@
         initSettings.version = this.instance.version;
         args = this.prepareObject(initSettings);
         args.unshift((options.clearDatastore ? 1 : 0));
+        this.isReady = true;
         return this.runScript("init", args);
       }).then((results) => {
         return this.clients;
@@ -988,17 +990,21 @@
     }
 
     runScript(name, args) {
-      return new this.Promise((resolve, reject) => {
-        var arr, script;
-        script = scripts[name];
-        arr = [this.shas[name], script.keys.length].concat(script.keys, args, function(err, replies) {
-          if (err != null) {
-            return reject(err);
-          }
-          return resolve(replies);
+      if (!this.isReady) {
+        return this.Promise.reject(new BottleneckError("This limiter is not done connecting to Redis yet. Wait for the 'ready' event to be triggered before submitting requests."));
+      } else {
+        return new this.Promise((resolve, reject) => {
+          var arr, script;
+          script = scripts[name];
+          arr = [this.shas[name], script.keys.length].concat(script.keys, args, function(err, replies) {
+            if (err != null) {
+              return reject(err);
+            }
+            return resolve(replies);
+          });
+          return this.client.evalsha.bind(this.client).apply({}, arr);
         });
-        return this.client.evalsha.bind(this.client).apply({}, arr);
-      });
+      }
     }
 
     convertBool(b) {

src/RedisStorage.coffee

@@ -58,6 +58,7 @@ class RedisStorage
     @shas = {}
 
     @clients = { client: @client, subscriber: @subClient }
+    @isReady = false
     @ready = new @Promise (resolve, reject) =>
       errorListener = (e) -> reject e
       count = 0
@@ -87,6 +88,7 @@ class RedisStorage
 
       args = @prepareObject(initSettings)
       args.unshift (if options.clearDatastore then 1 else 0)
+      @isReady = true
       @runScript "init", args
     .then (results) =>
       @clients
@@ -116,7 +118,8 @@ class RedisStorage
     arr
 
   runScript: (name, args) ->
-    new @Promise (resolve, reject) =>
+    if !@isReady then @Promise.reject new BottleneckError "This limiter is not done connecting to Redis yet. Wait for the 'ready' event to be triggered before submitting requests."
+    else new @Promise (resolve, reject) =>
       script = scripts[name]
       arr = [@shas[name], script.keys.length].concat script.keys, args, (err, replies) ->
         if err? then return reject err

test/redis.js

@@ -11,6 +11,19 @@ if (process.env.DATASTORE === 'redis') {
       c.limiter.disconnect(false)
     })
 
+    it('Errors out if not ready', function () {
+      c = makeTest({ maxConcurrent: 2 })
+
+      return c.limiter.schedule({id: 1}, c.slowPromise, 100, null, 1)
+      .then(function (result) {
+        return Promise.reject('Should not have been ready')
+      })
+      .catch(function (err) {
+        c.mustEqual(err.message, 'This limiter is not done connecting to Redis yet. Wait for the \'ready\' event to be triggered before submitting requests.')
+        return Promise.resolve()
+      })
+    })
+
     it('Publishes running decreases', function () {
       c = makeTest({ maxConcurrent: 2 })
       var limiter2, p1, p2, p3, p4