disconnect on shutdown

ezmobius · Oct 24, 2011 · f2bf2a3 · f2bf2a3
1 parent 959d926
commit f2bf2a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/redis.rb b/lib/redis.rb
@@ -1009,7 +1009,11 @@ def quit
   # Synchronously save the dataset to disk and then shut down the server.
   def shutdown
     synchronize do
-      @client.call_without_reply [:shutdown]
+      begin
+        @client.call_without_reply [:shutdown]
+      ensure
+        @client.disconnect
+      end
     end
   end
 

diff --git a/test/connection_handling_test.rb b/test/connection_handling_test.rb
@@ -49,6 +49,7 @@
 
     # SHUTDOWN does not reply: test that it does not raise here.
     assert nil == redis.shutdown
+    assert !redis.client.connected?
   end
 end