Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated redis config logic, Now takes a password

Browse Source 
- Previous config did not use multiple servers in any way.
- Cluster will now be created automatically if multiple servers given.
- Removed REDIS_CLUSTER option.

Closes #1283
This commit is contained in:
Dan Brown 2019-03-08 22:42:48 +00:00
parent d96baf2d4a
commit 646fd822c5
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.example.complete
View File

@ -75,6 +75,12 @@ CACHE_PREFIX=bookstack
# For multiple servers separate with a comma # For multiple servers separate with a comma
MEMCACHED_SERVERS=127.0.0.1:11211:100 MEMCACHED_SERVERS=127.0.0.1:11211:100
# Redis server configuration
# This follows the following format: HOST:PORT:DATABASE
# or, if using a password: HOST:PORT:DATABASE:PASSWORD
# For multiple servers separate with a comma. These will be clustered.
REDIS_SERVERS=127.0.0.1:6379:0
# Queue driver to use # Queue driver to use
# Queue not really currently used but may be configurable in the future. # Queue not really currently used but may be configurable in the future.
# Would advise not to change this for now. # Would advise not to change this for now.

36
config/database.php
View File

@ -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 = [ $redisConfig = [];
'cluster' => env('REDIS_CLUSTER', false) $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'; $serverConfig = [];
$redisConfig[$redisServerName] = array_combine($redisServerKeys, $redisServerDetails); $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 = env('DB_HOST', 'localhost');
$mysql_host_exploded = explode(':', $mysql_host); $mysql_host_exploded = explode(':', $mysql_host);
$mysql_port = env('DB_PORT', 3306); $mysql_port = env('DB_PORT', 3306);