misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

make sure GlobalModule.dispose always completes

Browse source
This commit is contained in:
Hazelnoot 2025-09-27 19:59:56 -04:00
parent e7f93f19bf
commit 4db8d0b9ed
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
packages/backend/src/GlobalModule.ts
View file

@ -8,6 +8,8 @@ import * as Redis from 'ioredis';
import { DataSource } from 'typeorm';
import { MeiliSearch } from 'meilisearch';
import { MiMeta } from '@/models/Meta.js';
import { bindThis } from '@/decorators.js';
import { renderInlineError } from '@/misc/render-inline-error.js';
import { DI } from './di-symbols.js';
import { Config, loadConfig } from './config.js';
import { createPostgresDataSource } from './postgres.js';
@ -189,12 +191,12 @@ export class GlobalModule implements OnApplicationShutdown {
// And then disconnect from DB
this.logger.info('Disconnected from data sources...');
await this.db.destroy();
this.redisClient.disconnect();
this.redisForPub.disconnect();
this.redisForSub.disconnect();
this.redisForTimelines.disconnect();
this.redisForReactions.disconnect();
this.redisForRateLimit.disconnect();
this.safeDisconnect(this.redisClient);
this.safeDisconnect(this.redisForPub);
this.safeDisconnect(this.redisForSub);
this.safeDisconnect(this.redisForTimelines);
this.safeDisconnect(this.redisForReactions);
this.safeDisconnect(this.redisForRateLimit);
this.logger.info('Global module disposed.');
}
@ -202,4 +204,12 @@ export class GlobalModule implements OnApplicationShutdown {
async onApplicationShutdown(signal: string): Promise<void> {
await this.dispose();
}
private safeDisconnect(redis: { disconnect(): void }): void {
try {
redis.disconnect();
} catch (err) {
this.logger.error(`Unhandled error disconnecting redis: ${renderInlineError(err)}`);
}
}
}