Fix missing scripts error

SGrondin · Aug 13, 2018 · f394ca3 · f394ca3
1 parent e261a09
commit f394ca3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/bottleneck.js b/bottleneck.js
@@ -1098,6 +1098,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       this.client = redis.createClient(this.clientOptions);
       this.subClient = redis.createClient(this.clientOptions);
       this.pubsubs = {};
+      this.shas = {};
       this.loaded = false;
       this.ready = new this.Promise((resolve, reject) => {
         var count, done, errorListener;
@@ -1184,7 +1185,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       this.initSettings = initSettings;
       this.originalId = this.instance.id;
       parser.load(options, options, this);
-      this.shas = {};
       this.isReady = false;
       this.connection = (ref = this._groupConnection) != null ? ref : new RedisConnection(this.clientOptions, this.Promise, this.instance.Events);
       this.ready = this.connection.ready.then(clients => {
@@ -1236,7 +1236,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           if (err != null) {
             return reject(err);
           }
-          this.shas[name] = replies[0];
+          this.connection.shas[name] = replies[0];
           return resolve(replies[0]);
         });
       });
@@ -1250,7 +1250,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         keys = Scripts.keys(name, this.originalId);
         return new this.Promise((resolve, reject) => {
           var arr;
-          arr = [this.shas[name], keys.length].concat(keys, args, function (err, replies) {
+          arr = [this.connection.shas[name], keys.length].concat(keys, args, function (err, replies) {
             if (err != null) {
               return reject(err);
             }

diff --git a/bottleneck.min.js b/bottleneck.min.js
diff --git a/lib/RedisConnection.js b/lib/RedisConnection.js
@@ -14,6 +14,7 @@
       this.client = redis.createClient(this.clientOptions);
       this.subClient = redis.createClient(this.clientOptions);
       this.pubsubs = {};
+      this.shas = {};
       this.loaded = false;
       this.ready = new this.Promise((resolve, reject) => {
         var count, done, errorListener;

diff --git a/lib/RedisStorage.js b/lib/RedisStorage.js
@@ -23,7 +23,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       this.initSettings = initSettings;
       this.originalId = this.instance.id;
       parser.load(options, options, this);
-      this.shas = {};
       this.isReady = false;
       this.connection = (ref = this._groupConnection) != null ? ref : new RedisConnection(this.clientOptions, this.Promise, this.instance.Events);
       this.ready = this.connection.ready.then(clients => {
@@ -75,7 +74,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           if (err != null) {
             return reject(err);
           }
-          this.shas[name] = replies[0];
+          this.connection.shas[name] = replies[0];
           return resolve(replies[0]);
         });
       });
@@ -89,7 +88,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         keys = Scripts.keys(name, this.originalId);
         return new this.Promise((resolve, reject) => {
           var arr;
-          arr = [this.shas[name], keys.length].concat(keys, args, function (err, replies) {
+          arr = [this.connection.shas[name], keys.length].concat(keys, args, function (err, replies) {
             if (err != null) {
               return reject(err);
             }

diff --git a/src/RedisConnection.coffee b/src/RedisConnection.coffee
@@ -4,6 +4,7 @@ class RedisConnection
     @client = redis.createClient @clientOptions
     @subClient = redis.createClient @clientOptions
     @pubsubs = {}
+    @shas = {}
     @loaded = false
 
     @ready = new @Promise (resolve, reject) =>

diff --git a/src/RedisStorage.coffee b/src/RedisStorage.coffee
@@ -3,12 +3,10 @@ BottleneckError = require "./BottleneckError"
 RedisConnection = require "./RedisConnection"
 Scripts = require "./Scripts"
 
-
 class RedisStorage
   constructor: (@instance, @initSettings, options) ->
     @originalId = @instance.id
     parser.load options, options, @
-    @shas = {}
     @isReady = false
 
     @connection = @_groupConnection ? new RedisConnection @clientOptions, @Promise, @instance.Events
@@ -38,15 +36,15 @@ class RedisStorage
 
       @clients.client.multi([["script", "load", payload]]).exec (err, replies) =>
         if err? then return reject err
-        @shas[name] = replies[0]
+        @connection.shas[name] = replies[0]
         return resolve replies[0]
 
   runScript: (name, args) ->
     if !@isReady then @Promise.reject new BottleneckError "This limiter is not done connecting to Redis yet. Wait for the '.ready()' promise to resolve before submitting requests."
     else
       keys = Scripts.keys name, @originalId
       new @Promise (resolve, reject) =>
-        arr = [@shas[name], keys.length].concat keys, args, (err, replies) ->
+        arr = [@connection.shas[name], keys.length].concat keys, args, (err, replies) ->
           if err? then return reject err
           return resolve replies
         @instance.Events.trigger "debug", ["Calling Redis script: #{name}.lua", args]