need to detect READONLY errors in read_response, now send_command. re…

…al fix for redis#435
rolette · Jun 2, 2014 · 96f08d7 · 96f08d7
1 parent 2114574
commit 96f08d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+* 2.10.1
+    * Fixed a bug where Sentinel connections to a server that's no longer a
+      master and receives a READONLY error will disconnect and reconnect to
+      the master.
 * 2.10.0
     * Discontinuted support for Python 2.5. Upgrade. You'll be happier.
     * The HiRedis parser will now properly raise ConnectionErrors.

diff --git a/redis/sentinel.py b/redis/sentinel.py
@@ -50,9 +50,9 @@ def connect(self):
                     continue
             raise SlaveNotFoundError  # Never be here
 
-    def send_command(self, *args):
+    def read_response(self):
         try:
-            super(SentinelManagedConnection, self).send_command(*args)
+            return super(SentinelManagedConnection, self).read_response()
         except ReadOnlyError:
             if self.connection_pool.is_master:
                 # When talking to a master, a ReadOnlyError when likely