moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

fix?

Browse Source
This commit is contained in:
tamaina 2023-07-20 10:18:22 +00:00
parent 3d213f189b
commit dfd6b4f213
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/src/config.ts
View File

@ -108,9 +108,9 @@ export type Mixin = {
mediaProxy: string; mediaProxy: string;
externalMediaProxyEnabled: boolean; externalMediaProxyEnabled: boolean;
videoThumbnailGenerator: string | null; videoThumbnailGenerator: string | null;
redis: RedisOptions; redis: RedisOptions & RedisOptionsSource;
redisForPubsub: RedisOptions; redisForPubsub: RedisOptions & RedisOptionsSource;
redisForJobQueue: RedisOptions; redisForJobQueue: RedisOptions & RedisOptionsSource;
}; };
export type Config = Source & Mixin; export type Config = Source & Mixin;

5
packages/backend/src/queue/const.ts
View File

@ -14,7 +14,10 @@ export const QUEUE = {
export function baseQueueOptions(config: Config, queueName: typeof QUEUE[keyof typeof QUEUE]): Bull.QueueOptions { export function baseQueueOptions(config: Config, queueName: typeof QUEUE[keyof typeof QUEUE]): Bull.QueueOptions {
return { return {
connection: config.redisForJobQueue, connection: {
...config.redisForJobQueue,
keyPrefix: undefined
},
prefix: config.redisForJobQueue.prefix ? `${config.redisForJobQueue.prefix}:queue:${queueName}` : `queue:${queueName}`, prefix: config.redisForJobQueue.prefix ? `${config.redisForJobQueue.prefix}:queue:${queueName}` : `queue:${queueName}`,
}; };
} }