mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-11-27 14:28:24 +09:00
Code

Fix: Use consistent REDIS_USER environment variable in streaming (#32493)

Browse Source
This commit is contained in:
Emelia Smith 2024-10-15 09:40:18 +02:00 committed by GitHub
parent 7c10b0fb7a
commit 6d99f848a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
streaming/redis.js
View File

@ -50,9 +50,9 @@ function getSentinelConfiguration(env, commonOptions) {
return { return {
db: redisDatabase, db: redisDatabase,
name: env.REDIS_SENTINEL_MASTER, name: env.REDIS_SENTINEL_MASTER,
username: env.REDIS_USERNAME, username: env.REDIS_USER,
password: env.REDIS_PASSWORD, password: env.REDIS_PASSWORD,
sentinelUsername: env.REDIS_SENTINEL_USERNAME ?? env.REDIS_USERNAME, sentinelUsername: env.REDIS_SENTINEL_USERNAME ?? env.REDIS_USER,
sentinelPassword: env.REDIS_SENTINEL_PASSWORD ?? env.REDIS_PASSWORD, sentinelPassword: env.REDIS_SENTINEL_PASSWORD ?? env.REDIS_PASSWORD,
sentinels, sentinels,
...commonOptions, ...commonOptions,
@ -104,7 +104,7 @@ export function configFromEnv(env) {
host: env.REDIS_HOST ?? '127.0.0.1', host: env.REDIS_HOST ?? '127.0.0.1',
port: redisPort, port: redisPort,
db: redisDatabase, db: redisDatabase,
username: env.REDIS_USERNAME, username: env.REDIS_USER,
password: env.REDIS_PASSWORD, password: env.REDIS_PASSWORD,
...commonOptions, ...commonOptions,
}; };