mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Compare commits
2 commits
1e554d2b26
...
d2b3638d09
Author | SHA1 | Date | |
---|---|---|---|
|
d2b3638d09 | ||
|
6af2106be4 |
1 changed files with 6 additions and 6 deletions
|
@ -241,16 +241,16 @@ const redisConfigFromEnv = (env) => {
|
||||||
// which means we can't use it. But this is something that should be looked into.
|
// which means we can't use it. But this is something that should be looked into.
|
||||||
const redisPrefix = env.REDIS_NAMESPACE ? `${env.REDIS_NAMESPACE}:` : '';
|
const redisPrefix = env.REDIS_NAMESPACE ? `${env.REDIS_NAMESPACE}:` : '';
|
||||||
|
|
||||||
let redisPort = parseIntFromEnv(env.REDIS_PORT, 6379, 'REDIS_PORT');
|
|
||||||
let redisDatabase = parseIntFromEnv(env.REDIS_DB, 0, 'REDIS_DB');
|
|
||||||
|
|
||||||
/** @type {import('ioredis').RedisOptions} */
|
/** @type {import('ioredis').RedisOptions} */
|
||||||
const redisParams = {
|
const redisParams = typeof env.REDIS_URL !== 'string' ? {
|
||||||
host: env.REDIS_HOST || '127.0.0.1',
|
host: env.REDIS_HOST || '127.0.0.1',
|
||||||
port: redisPort,
|
port: parseIntFromEnv(env.REDIS_PORT, 6379, 'REDIS_PORT'),
|
||||||
db: redisDatabase,
|
db: parseIntFromEnv(env.REDIS_DB, 0, 'REDIS_DB'),
|
||||||
password: env.REDIS_PASSWORD || undefined,
|
password: env.REDIS_PASSWORD || undefined,
|
||||||
};
|
} : {};
|
||||||
|
|
||||||
|
|
||||||
// redisParams.path takes precedence over host and port.
|
// redisParams.path takes precedence over host and port.
|
||||||
if (env.REDIS_URL && env.REDIS_URL.startsWith('unix://')) {
|
if (env.REDIS_URL && env.REDIS_URL.startsWith('unix://')) {
|
||||||
|
|
Loading…
Reference in a new issue