Set timeout to 5s if WP_REDIS_FLUSH_TIMEOUT is not defined

rhubarbgroup · Mar 20, 2024 · 9c0e429 · 9c0e429
1 parent c2dcf02
commit 9c0e429
Showing 1 changed file with 18 additions and 26 deletions.
diff --git a/includes/object-cache.php b/includes/object-cache.php
@@ -1599,33 +1599,29 @@ protected function execute_lua_script( $script ) {
         $results = [];
 
         if ( defined( 'WP_REDIS_CLUSTER' ) ) {
-            return $this->execute_lua_script_on_cluster( $script ) 
+            return $this->execute_lua_script_on_cluster( $script );
         }
 
-        if ( defined( 'WP_REDIS_FLUSH_TIMEOUT' ) ) {
-            if ( $this->is_predis() ) {
-                $timeout = $this->redis->getConnection()->getParameters()->read_write_timeout ?? ini_get( 'default_socket_timeout' );
-                stream_set_timeout( $this->redis->getConnection()->getResource(), WP_REDIS_FLUSH_TIMEOUT );
-            } else {
-                $timeout = $this->redis->getOption( Redis::OPT_READ_TIMEOUT );
-                $this->redis->setOption( Redis::OPT_READ_TIMEOUT, WP_REDIS_FLUSH_TIMEOUT );
-            }
+        $flushTimeout = defined( 'WP_REDIS_FLUSH_TIMEOUT' ) ? WP_REDIS_FLUSH_TIMEOUT : 5;
+        if ( $this->is_predis() ) {
+            $timeout = $this->redis->getConnection()->getParameters()->read_write_timeout ?? ini_get( 'default_socket_timeout' );
+            stream_set_timeout( $this->redis->getConnection()->getResource(), $flushTimeout );
+        } else {
+            $timeout = $this->redis->getOption( Redis::OPT_READ_TIMEOUT );
+            $this->redis->setOption( Redis::OPT_READ_TIMEOUT, $flushTimeout );
         }
 
         try {
             $results[] = $this->parse_redis_response( $script() );
         } catch ( Exception $exception ) {
             $this->handle_exception( $exception );
-
-            return false;
+            $results = false;
         }
 
-        if ( isset( $timeout ) ) {
-            if ( $this->is_predis() ) {
-                stream_set_timeout( $this->redis->getConnection()->getResource(), $timeout );
-            } else {
-                $this->redis->setOption( Redis::OPT_READ_TIMEOUT, $timeout );
-            }
+        if ( $this->is_predis() ) {
+            stream_set_timeout( $this->redis->getConnection()->getResource(), $timeout );
+        } else {
+            $this->redis->setOption( Redis::OPT_READ_TIMEOUT, $timeout );
         }
 
         return $results;
@@ -1641,26 +1637,22 @@ protected function execute_lua_script_on_cluster( $script ) {
 
         $redis = $this->redis;
 
+        $flushTimeout = defined( 'WP_REDIS_FLUSH_TIMEOUT' ) ? WP_REDIS_FLUSH_TIMEOUT : 5;
         if ( $this->is_predis() ) {
             foreach ( $this->redis->getIterator() as $master ) {
-                if ( defined( 'WP_REDIS_FLUSH_TIMEOUT' ) ) {
-                    $timeout = $master->getConnection()->getParameters()->read_write_timeout ?? ini_get( 'default_socket_timeout' );
-                    stream_set_timeout( $master->getConnection()->getResource(), WP_REDIS_FLUSH_TIMEOUT );
-                }
+                $timeout = $master->getConnection()->getParameters()->read_write_timeout ?? ini_get( 'default_socket_timeout' );
+                stream_set_timeout( $master->getConnection()->getResource(), $flushTimeout );
 
                 $this->redis = $master;
                 $results[] = $this->parse_redis_response( $script() );
 
-                if ( isset($timeout) ) {
-                    stream_set_timeout($master->getConnection()->getResource(), $timeout);
-                    unset($timeout);
-                }
+                stream_set_timeout($master->getConnection()->getResource(), $timeout);
             }
         } else {
             try {
                 foreach ( $this->redis->_masters() as $master ) {
                     $this->redis = new Redis();
-                    $this->redis->connect( $master[0], $master[1], defined( 'WP_REDIS_FLUSH_TIMEOUT' ) ? WP_REDIS_FLUSH_TIMEOUT : 0 );
+                    $this->redis->connect( $master[0], $master[1], 0, null, 0, $flushTimeout );
                     $results[] = $this->parse_redis_response( $script() );
                 }
             } catch ( Exception $exception ) {