Clean up transaction on client-side errors.

slact · Dec 27, 2010 · c9b3ed2 · c9b3ed2
1 parent f00ec5d
commit c9b3ed2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/redis.lua b/src/redis.lua
@@ -451,11 +451,12 @@ do
             end
             return replies
         end
-        local success, retval = assert(coroutine.resume(coro))
-
-        if #queued_parsers == 0 then 
+
+        local success, retval = coroutine.resume(coro)
+        if #queued_parsers == 0 or not success then
             client:discard()
-            return replies 
+            assert(success, retval)
+            return replies
         end
 
         local raw_replies = client:exec()

diff --git a/test/test_client.lua b/test/test_client.lua
@@ -2104,6 +2104,16 @@ context("Redis commands", function()
                 assert_response_queued(t:exists('foo'))
             end)
             assert_table_values(replies, { true, 'hello', 'redis', false })
+
+            -- clean up transaction after client-side errors
+            assert_error(function()
+                redis:transaction(function(t)
+                    t:lpush('metavars', 'foo')
+                    error('whoops!')
+                    t:lpush('metavars', 'hoge')
+                end)
+            end)
+            assert_false(redis:exists('metavars'))
         end)
 
         test("WATCH / MULTI / EXEC abstraction", function()