Browse Source

bug fix

pull/4270/merge^2
HarukaKishida 3 weeks ago
parent
commit
8a5dbac5bc
  1. 16
      apps/api/src/app/redis-cache/redis-cache.module.ts
  2. 4
      apps/api/src/app/redis-cache/redis-cache.service.ts

16
apps/api/src/app/redis-cache/redis-cache.module.ts

@ -1,7 +1,7 @@
import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
import KeyvRedis, { Keyv } from '@keyv/redis'; import { createKeyv } from '@keyv/redis';
import { CacheModule } from '@nestjs/cache-manager'; import { CacheModule } from '@nestjs/cache-manager';
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
@ -10,7 +10,7 @@ import { RedisCacheService } from './redis-cache.service';
@Module({ @Module({
exports: [RedisCacheService], exports: [RedisCacheService],
imports: [ imports: [
CacheModule.registerAsync<Keyv>({ CacheModule.registerAsync({
imports: [ConfigurationModule], imports: [ConfigurationModule],
inject: [ConfigurationService], inject: [ConfigurationService],
useFactory: async (configurationService: ConfigurationService) => { useFactory: async (configurationService: ConfigurationService) => {
@ -19,14 +19,12 @@ import { RedisCacheService } from './redis-cache.service';
); );
return { return {
store: new Keyv({ stores: [
store: new KeyvRedis( createKeyv(
`redis://${redisPassword ? `:${redisPassword}` : ''}@${configurationService.get('REDIS_HOST')}:${configurationService.get('REDIS_PORT')}/${configurationService.get('REDIS_DB')}` `redis://${redisPassword ? `:${redisPassword}` : ''}@${configurationService.get('REDIS_HOST')}:${configurationService.get('REDIS_PORT')}/${configurationService.get('REDIS_DB')}`
), )
ttl: configurationService.get('CACHE_TTL'), ]
useKeyPrefix: false };
})
} as Keyv;
} }
}), }),
ConfigurationModule ConfigurationModule

4
apps/api/src/app/redis-cache/redis-cache.service.ts

@ -22,11 +22,11 @@ export class RedisCacheService {
const keys = []; const keys = [];
const prefix = aPrefix; const prefix = aPrefix;
this.cache.stores[0].iterator((key) => { for await (const [key] of this.cache.stores[0].iterator({})) {
if ((prefix && key.startsWith(prefix)) || !prefix) { if ((prefix && key.startsWith(prefix)) || !prefix) {
keys.push(key); keys.push(key);
} }
}); }
return keys; return keys;
} }

Loading…
Cancel
Save