Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:27:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5492 from turbo124/v5-develop

Browse Source 
Redis Sentinel configuration
This commit is contained in:
David Bomba 2021-04-21 15:11:40 +10:00 committed by GitHub
commit 6b60b56e97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 193 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -58,7 +58,6 @@
"league/omnipay": "^3.1",
"livewire/livewire": "^2.0",
"maennchen/zipstream-php": "^1.2",
"monospice/laravel-redis-sentinel-drivers": "^2.7",
"nwidart/laravel-modules": "^8.0",
"omnipay/paypal": "^3.0",
"pragmarx/google2fa": "^8.0",

518
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

4
config/cache.php
View File

@ -86,10 +86,6 @@ return [
'endpoint' => env('DYNAMODB_ENDPOINT'),
],
'redis-sentinel' => [
'driver' => 'redis-sentinel',
'connection' => 'default',
],
],
/*

53
config/database.php
View File

@ -154,14 +154,13 @@ return [
],
'sentinel-default' => array_merge(
[
"host" => "v5db1",
"port" => "26379",
],
[
"host" => "v5db2",
"port" => "26379",
],
array_map(
function ($a, $b) {
return ["host" => $a,"port" => $b];
},
explode(',', env('REDIS_HOST', 'localhost')),
explode(',', env('REDIS_PORT', 26379))
),
['options' => [
'replication' => 'sentinel',
'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'),
@ -173,14 +172,13 @@ return [
),
'sentinel-cache' => array_merge(
[
"host" => "v5db1",
"port" => "26379",
],
[
"host" => "v5db2",
"port" => "26379",
],
array_map(
function ($a, $b) {
return ["host" => $a,"port" => $b];
},
explode(',', env('REDIS_HOST', 'localhost')),
explode(',', env('REDIS_PORT', 26379))
),
['options' => [
'replication' => 'sentinel',
'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'),
@ -193,27 +191,4 @@ return [
],
'redis-sentinel' => [
'default' => [
[
'host' => 'v5db1',
'port' => 26379,
],
[
'host' => 'v5db2',
'port' => 26379,
],
],
'options' => [
'service' => env('REDIS_SENTINEL_SERVICE', 'mymaster'),
'parameters' => [
'password' => env('REDIS_PASSWORD', null),
'database' => 0,
],
],
],
];

7
config/queue.php
View File

@ -67,13 +67,6 @@ return [
'block_for' => null,
],
'redis-sentinel' => [
'driver' => 'redis-sentinel',
'connection' => 'default',
'queue' => 'default',
'retry_after' => 90, // Laravel >= 5.4.30
'expire' => 90, // Laravel < 5.4.30
],
],
/*

2
config/session.php
View File

@ -72,7 +72,7 @@ return [
|
*/
'connection' => env('SESSION_CONNECTION', 'default'),
'connection' => env('SESSION_CONNECTION', null),
/*
|--------------------------------------------------------------------------