Merge pull request #268 from pantheon-systems/use-proc-open-directly

Fix `wp redis cli` by using `proc_open()` directly
pantheon-systems · Feb 24, 2020 · 79e64c5 · 79e64c5
2 parents dd58ff8 + 9ea40ec
commit 79e64c5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 **Tags:** cache, plugin, redis  
 **Requires at least:** 3.0.1  
 **Tested up to:** 5.3  
-**Stable tag:** 0.8.2  
+**Stable tag:** 0.8.3  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -107,6 +107,9 @@ There's a known issue with WordPress `alloptions` cache design. Specifically, a
 
 ## Changelog ##
 
+### 0.8.3 (February 24, 2020) ###
+* Fixes `wp redis cli` by using `proc_open()` directly, instead of `WP_CLI::launch()` [[#268](https://github.com/pantheon-systems/wp-redis/pull/268)].
+
 ### 0.8.2 (January 15, 2020) ###
 * Catches exceptions when trying to connect to Redis [[#265](https://github.com/pantheon-systems/wp-redis/pull/265)].
 

diff --git a/cli.php b/cli.php
@@ -23,6 +23,7 @@ public function cli() {
 				$redis_server = array(
 					'host' => '127.0.0.1',
 					'port' => 6379,
+					'auth' => '',
 				);
 			}
 		}
@@ -31,9 +32,10 @@ public function cli() {
 			$redis_server['database'] = 0;
 		}
 
-		$cmd = WP_CLI\Utils\esc_cmd( 'redis-cli -h "%s" -p "%s" -a "%s" -n "%d"', $redis_server['host'], $redis_server['port'], $redis_server['auth'], $redis_server['database'] );
-		WP_CLI::launch( $cmd );
-
+		$cmd     = WP_CLI\Utils\esc_cmd( 'redis-cli -h %s -p %s -a %s -n %s', $redis_server['host'], $redis_server['port'], $redis_server['auth'], $redis_server['database'] );
+		$process = WP_CLI\Utils\proc_open_compat( $cmd, array( STDIN, STDOUT, STDERR ), $pipes );
+		$r       = proc_close( $process );
+		exit( (int) $r );
 	}
 
 	/**

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: getpantheon, danielbachhuber, mboynes, Outlandish Josh
 Tags: cache, plugin, redis
 Requires at least: 3.0.1
 Tested up to: 5.3
-Stable tag: 0.8.2
+Stable tag: 0.8.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -107,6 +107,9 @@ There's a known issue with WordPress `alloptions` cache design. Specifically, a
 
 == Changelog ==
 
+= 0.8.3 (February 24, 2020) =
+* Fixes `wp redis cli` by using `proc_open()` directly, instead of `WP_CLI::launch()` [[#268](https://github.com/pantheon-systems/wp-redis/pull/268)].
+
 = 0.8.2 (January 15, 2020) =
 * Catches exceptions when trying to connect to Redis [[#265](https://github.com/pantheon-systems/wp-redis/pull/265)].
 

diff --git a/wp-redis.php b/wp-redis.php
@@ -3,7 +3,7 @@
  * Plugin Name: WP Redis
  * Plugin URI: http://github.com/pantheon-systems/wp-redis/
  * Description: WordPress Object Cache using Redis. Requires the PhpRedis extension (https://github.com/phpredis/phpredis).
- * Version: 0.8.2
+ * Version: 0.8.3
  * Author: Pantheon, Josh Koenig, Matthew Boynes, Daniel Bachhuber, Alley Interactive
  * Author URI: https://pantheon.io/
  */