self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-01-02 12:48:35 +02:00
Code Issues Releases Activity

feat(server): redis sentinel support (#2141)

Browse Source 
* feat(server): redis sentinel initial support

* feat(server): Lint fixes

* Include example for Redis Sentinel.

* Address PR comments
This commit is contained in:
Skyler Mäntysaari 2023-03-31 23:33:21 +03:00 committed by GitHub
parent 51785a1ead
commit 23e4449f27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/example.env
View File

@ -16,6 +16,11 @@ DB_DATABASE_NAME=immich
REDIS_HOSTNAME=immich_redis REDIS_HOSTNAME=immich_redis
# REDIS_URL will be used to pass custom options to ioredis.
# Example for Sentinel
# {"sentinels":[{"host":"redis-sentinel-node-0","port":26379},{"host":"redis-sentinel-node-1","port":26379},{"host":"redis-sentinel-node-2","port":26379}],"name":"redis-sentinel"}
# REDIS_URL=ioredis://eyJzZW50aW5lbHMiOlt7Imhvc3QiOiJyZWRpcy1zZW50aW5lbDEiLCJwb3J0IjoyNjM3OX0seyJob3N0IjoicmVkaXMtc2VudGluZWwyIiwicG9ydCI6MjYzNzl9XSwibmFtZSI6Im15bWFzdGVyIn0=
# Optional Redis settings: # Optional Redis settings:
# Note: these parameters are not automatically passed to the Redis Container # Note: these parameters are not automatically passed to the Redis Container
@ -24,6 +29,7 @@ REDIS_HOSTNAME=immich_redis
# REDIS_PORT=6379 # REDIS_PORT=6379
# REDIS_DBINDEX=0 # REDIS_DBINDEX=0
# REDIS_USERNAME=
# REDIS_PASSWORD= # REDIS_PASSWORD=
# REDIS_SOCKET= # REDIS_SOCKET=

28
server/libs/infra/src/infra.config.ts
View File

@ -3,13 +3,27 @@ import { BullModuleOptions } from '@nestjs/bull';
import { RedisOptions } from 'ioredis'; import { RedisOptions } from 'ioredis';
import { ConfigurationOptions } from 'typesense/lib/Typesense/Configuration'; import { ConfigurationOptions } from 'typesense/lib/Typesense/Configuration';
export const redisConfig: RedisOptions = { function parseRedisConfig(): RedisOptions {
host: process.env.REDIS_HOSTNAME || 'immich_redis', const redisUrl = process.env.REDIS_URL;
port: parseInt(process.env.REDIS_PORT || '6379'), if (redisUrl && redisUrl.startsWith('ioredis://')) {
db: parseInt(process.env.REDIS_DBINDEX || '0'), try {
password: process.env.REDIS_PASSWORD || undefined, const decodedString = Buffer.from(redisUrl.slice(10), 'base64').toString();
path: process.env.REDIS_SOCKET || undefined, return JSON.parse(decodedString);
}; } catch (error) {
throw new Error(`Failed to decode redis options: ${error}`);
}
}
return {
host: process.env.REDIS_HOSTNAME || 'immich_redis',
port: parseInt(process.env.REDIS_PORT || '6379'),
db: parseInt(process.env.REDIS_DBINDEX || '0'),
username: process.env.REDIS_USERNAME || undefined,
password: process.env.REDIS_PASSWORD || undefined,
path: process.env.REDIS_SOCKET || undefined,
};
}
export const redisConfig: RedisOptions = parseRedisConfig();
export const bullConfig: BullModuleOptions = { export const bullConfig: BullModuleOptions = {
prefix: 'immich_bull', prefix: 'immich_bull',