Merge pull request #265 from pantheon-systems/fix-226-handle-redis-ex…

…ception-on-connect Catch exceptions when trying to connect to Redis
pantheon-systems · Jan 15, 2020 · dd58ff8 · dd58ff8
2 parents 103d6e0 + 2201173
commit dd58ff8
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 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.1  
+**Stable tag:** 0.8.2  
 **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.2 (January 15, 2020) ###
+* Catches exceptions when trying to connect to Redis [[#265](https://github.com/pantheon-systems/wp-redis/pull/265)].
+
 ### 0.8.1 (January 10, 2020) ###
 * Adds `WP_REDIS_DEFAULT_EXPIRE_SECONDS` constant to set default cache expire value [[#264](https://github.com/pantheon-systems/wp-redis/pull/264)].
 

diff --git a/composer.json b/composer.json
@@ -20,6 +20,7 @@
   "scripts": {
     "lint": "@phpcs",
     "phpcs": "vendor/bin/phpcs",
+    "phpcbf": "vendor/bin/phpcbf",
     "phpunit": "vendor/bin/phpunit",
     "test": "@phpunit"
   }

diff --git a/object-cache.php b/object-cache.php
@@ -1002,14 +1002,18 @@ protected function _connect_redis() {
 		}
 		$client_parameters = $this->build_client_parameters( $redis_server );
 
-		$client_connection = array( $this, 'prepare_client_connection' );
-		/**
-		 * Permits alternate initial client connection mechanism to be used.
-		 *
-		 * @param callable $client_connection Callback to execute.
-		 */
-		$client_connection = apply_filters( 'wp_redis_prepare_client_connection_callback', $client_connection );
-		$this->redis       = call_user_func_array( $client_connection, array( $client_parameters ) );
+		try {
+			$client_connection = array( $this, 'prepare_client_connection' );
+			/**
+			 * Permits alternate initial client connection mechanism to be used.
+			 *
+			 * @param callable $client_connection Callback to execute.
+			 */
+			$client_connection = apply_filters( 'wp_redis_prepare_client_connection_callback', $client_connection );
+			$this->redis       = call_user_func_array( $client_connection, array( $client_parameters ) );
+		} catch ( Exception $e ) {
+			$this->_exception_handler( $e );
+		}
 
 		$keys_methods = array(
 			'auth'     => 'auth',

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.1
+Stable tag: 0.8.2
 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.2 (January 15, 2020) =
+* Catches exceptions when trying to connect to Redis [[#265](https://github.com/pantheon-systems/wp-redis/pull/265)].
+
 = 0.8.1 (January 10, 2020) =
 * Adds `WP_REDIS_DEFAULT_EXPIRE_SECONDS` constant to set default cache expire value [[#264](https://github.com/pantheon-systems/wp-redis/pull/264)].
 

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.1
+ * Version: 0.8.2
  * Author: Pantheon, Josh Koenig, Matthew Boynes, Daniel Bachhuber, Alley Interactive
  * Author URI: https://pantheon.io/
  */