fix evalauto command

thunks · Oct 12, 2017 · 8a62fd6 · 8a62fd6
1 parent f66051c
commit 8a62fd6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/commands.js b/lib/commands.js
@@ -309,12 +309,19 @@ exports.initCommands = function (proto) {
 
       if (connection.evalshaP[script]) {
         args[0] = yield connection.evalshaP[script]
-        return yield connection.sendCommand('evalsha', args)
+        try {
+          return yield connection.sendCommand('evalsha', args)
+        } catch (err) {
+          if (err.name !== 'NOSCRIPT') throw err
+          // try to load script
+          args[0] = script
+        }
       }
 
       let res = yield connection.sendCommand('eval', args)
       // connection maybe change with MOVED response
       connection = this._redisState.getConnection(slot)
+      if (connection instanceof Error) throw connection
       connection.evalshaP[script] = thunk.promise(connection.sendCommand('script', ['load', script]))
       return res
     })

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thunk-redis",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "The fastest thunk/promise-based redis client, support all redis features.",
   "main": "lib/index.js",
   "authors": [