Update maintenance.php

[bookstack] / config / database.php

diff --git a/config/database.php b/config/database.php
index 6ca902944ed14644d8ded1631ac4bc3ae0749746..93a44854f092a8d166b9ce994a41da9dacb67a99 100644 (file)
--- a/config/database.php
+++ b/config/database.php
@@ -8,23 +8,39 @@
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
 
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
 

-// REDIS - Split out configuration into an array
+// REDIS
+// Split out configuration into an array

 if (env('REDIS_SERVERS', false)) {
 if (env('REDIS_SERVERS', false)) {

-    $redisServerKeys = ['host', 'port', 'database'];
+
+    $redisDefaults = ['host' => '127.0.0.1', 'port' => '6379', 'database' => '0', 'password' => null];

     $redisServers = explode(',', trim(env('REDIS_SERVERS', '127.0.0.1:6379:0'), ','));
     $redisServers = explode(',', trim(env('REDIS_SERVERS', '127.0.0.1:6379:0'), ','));

-    $redisConfig = [
-        'cluster' => env('REDIS_CLUSTER', false)
-    ];
+    $redisConfig = [];
+    $cluster = count($redisServers) > 1;
+
+    if ($cluster) {
+        $redisConfig['clusters'] = ['default' => []];
+    }
+

     foreach ($redisServers as $index => $redisServer) {
     foreach ($redisServers as $index => $redisServer) {

-        $redisServerName = ($index === 0) ? 'default' : 'redis-server-' . $index;

         $redisServerDetails = explode(':', $redisServer);
         $redisServerDetails = explode(':', $redisServer);

-        if (count($redisServerDetails) < 2) $redisServerDetails[] = '6379';
-        if (count($redisServerDetails) < 3) $redisServerDetails[] = '0';
-        $redisConfig[$redisServerName] = array_combine($redisServerKeys, $redisServerDetails);
+
+        $serverConfig = [];
+        $configIndex = 0;
+        foreach ($redisDefaults as $configKey => $configDefault) {
+            $serverConfig[$configKey] = ($redisServerDetails[$configIndex] ?? $configDefault);
+            $configIndex++;
+        }
+
+        if ($cluster) {
+            $redisConfig['clusters']['default'][] = $serverConfig;
+        } else {
+            $redisConfig['default'] = $serverConfig;
+        }

     }
 }
 
     }
 }
 

-// MYSQL - Split out port from host if set
+// MYSQL
+// Split out port from host if set

 $mysql_host = env('DB_HOST', 'localhost');
 $mysql_host_exploded = explode(':', $mysql_host);
 $mysql_port = env('DB_PORT', 3306);
 $mysql_host = env('DB_HOST', 'localhost');
 $mysql_host_exploded = explode(':', $mysql_host);
 $mysql_port = env('DB_PORT', 3306);