Protect against connection reuse across forks

redis · May 4, 2012 · 1bd4334 · wjessop · May 7, 2012 · pietern
1 parent 2a102c3
commit 1bd4334
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/redis/client.rb b/lib/redis/client.rb
@@ -272,7 +272,18 @@ def ensure_connected
       tries = 0
 
       begin
-        connect unless connected?
+        if connected?
+          if Process.pid != @pid
+            raise InheritedError, <<-EOS.gsub(/(?:^|\n)\s*/, " ").strip
+              Tried to use a connection from a child process without reconnecting.
+              You need to reconnect to Redis after forking.
+            EOS
+          end
+        else
+          @pid = Process.pid
+          connect
+        end
+
         tries += 1
 
         yield

diff --git a/lib/redis/errors.rb b/lib/redis/errors.rb
@@ -33,4 +33,8 @@ class ConnectionError < BaseConnectionError
   # Raised when performing I/O times out.
   class TimeoutError < BaseConnectionError
   end
+
+  # Raised when the connection was inherited by a child process.
+  class InheritedError < BaseConnectionError
+  end
 end