Skip to content

Commit a9d13ab

Browse files
committed
chore: improve redis/doctrine configuration
spec out REDIS_DOCTRINE_DATABASE for doctrine cache Signed-off-by: [email protected] <[email protected]> Change-Id: Ia3d2e23b2da80c8260cf79a57f52e14275fcc7e8
1 parent 5fa22d1 commit a9d13ab

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

config/cache.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@
6363
'connection' => env('CACHE_REDIS_CONN', 'cache'),
6464
],
6565

66+
'redis_doctrine' => [
67+
'driver' => 'redis',
68+
// <-- must match your redis connection name in config/database.php
69+
// see https://github.com/OpenStackweb/openstackid/blob/main/config/database.php#L141
70+
'connection' => 'doctrine',
71+
'prefix' => env('DOCTRINE_CACHE_PREFIX', null),
72+
],
73+
6674
],
6775

6876
/*

config/database.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,14 @@
138138
'timeout' => env('REDIS_TIMEOUT', 30.0),
139139
'scheme' => env('REDIS_SCHEME', 'tcp'),
140140
],
141+
'doctrine' => [
142+
'host' => env('REDIS_HOST'),
143+
'port' => env('REDIS_PORT'),
144+
'database' => env('REDIS_DOCTRINE_DATABASE', 5),
145+
'password' => env('REDIS_PASSWORD'),
146+
'timeout' => env('REDIS_TIMEOUT', 30.0),
147+
'scheme' => env('REDIS_SCHEME', 'tcp'),
148+
],
141149
],
142150
'allow_disabled_pk' => env('ALLOW_DISABLED_PK', false),
143151
];

config/doctrine.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,27 +221,30 @@
221221
*/
222222
'cache' => [
223223
'default' => env('DOCTRINE_CACHE', 'redis'),
224-
'namespace' => null,
224+
'namespace' => "idp",
225225
'second_level' => [
226226
'enabled' => true,
227227
'region_lifetime' => 3600,
228228
'region_lock_lifetime' => 60,
229-
'regions' => [
230-
229+
'regions' => [
230+
'default' => [
231+
'lifetime' => 3600, // Example: 1 hour
232+
'cache_driver' => 'redis_doctrine', // Use the cache connection name
233+
],
231234
],
232235
'log_enabled' => true,
233236
'file_lock_region_directory' => '/tmp'
234237
],
235238
'metadata' => [
236-
'driver' => env('DOCTRINE_METADATA_CACHE', env('DOCTRINE_CACHE', 'redis')),
239+
'driver' => env('DOCTRINE_METADATA_CACHE', env('DOCTRINE_CACHE', 'redis_doctrine')),
237240
'namespace' => null,
238241
],
239242
'query' => [
240-
'driver' => env('DOCTRINE_QUERY_CACHE', env('DOCTRINE_CACHE', 'redis')),
243+
'driver' => env('DOCTRINE_QUERY_CACHE', env('DOCTRINE_CACHE', 'redis_doctrine')),
241244
'namespace' => null,
242245
],
243246
'result' => [
244-
'driver' => env('DOCTRINE_RESULT_CACHE', env('DOCTRINE_CACHE', 'redis')),
247+
'driver' => env('DOCTRINE_RESULT_CACHE', env('DOCTRINE_CACHE', 'redis_doctrine')),
245248
'namespace' => null,
246249
],
247250
],

0 commit comments

Comments
 (0)