[6.x] Reconnect on connection missing to recover horizon

src/Illuminate/Redis/Connections/PhpRedisConnection.php

@@ -4,23 +4,34 @@
 
 use Closure;
 use Illuminate\Contracts\Redis\Connection as ConnectionContract;
+use Illuminate\Support\Str;
 use Redis;
 use RedisCluster;
+use RedisException;
 
 /**
  * @mixin \Redis
  */
 class PhpRedisConnection extends Connection implements ConnectionContract
 {
+    /**
+     * The connection creation callback.
+     *
+     * @var callable
+     */
+    protected $connector;
+
     /**
      * Create a new PhpRedis connection.
      *
      * @param  \Redis  $client
+     * @param  callable  $connector
      * @return void
      */
-    public function __construct($client)
+    public function __construct($client, callable $connector = null)
     {
         $this->client = $client;
+        $this->connector = $connector;
     }
 
     /**
@@ -416,6 +427,26 @@ public function executeRaw(array $parameters)
         return $this->command('rawCommand', $parameters);
     }
 
+    /**
+     * Run a command against the Redis database.
+     *
+     * @param  string  $method
+     * @param  array  $parameters
+     * @return mixed
+     */
+    public function command($method, array $parameters = [])
+    {
+        try {
+            return parent::command($method, $parameters);
+        } catch (RedisException $e) {
+            if (Str::contains($e->getMessage(), 'went away')) {
+                $this->client = $this->connector ? call_user_func($this->connector) : $this->client;
+            }
+
+            throw $e;
+        }
+    }
+
     /**
      * Disconnects from the Redis instance.
      *

src/Illuminate/Redis/Connectors/PhpRedisConnector.php

@@ -22,9 +22,13 @@ class PhpRedisConnector implements Connector
      */
     public function connect(array $config, array $options)
     {
-        return new PhpRedisConnection($this->createClient(array_merge(
-            $config, $options, Arr::pull($config, 'options', [])
-        )));
+        $connector = function () use ($config, $options) {
+            return $this->createClient(array_merge(
+                $config, $options, Arr::pull($config, 'options', [])
+            ));
+        };
+
+        return new PhpRedisConnection($connector(), $connector);
     }
 
     /**