summaryrefslogtreecommitdiff
path: root/packages/backend/src/GlobalModule.ts
diff options
context:
space:
mode:
authorJulia <julia@insertdomain.name>2025-05-29 00:07:38 +0000
committerJulia <julia@insertdomain.name>2025-05-29 00:07:38 +0000
commit6b554c178b81f13f83a69b19d44b72b282a0c119 (patch)
treef5537f1a56323a4dd57ba150b3cb84a2d8b5dc63 /packages/backend/src/GlobalModule.ts
parentmerge: Security fixes (!970) (diff)
parentbump version for release (diff)
downloadsharkey-6b554c178b81f13f83a69b19d44b72b282a0c119.tar.gz
sharkey-6b554c178b81f13f83a69b19d44b72b282a0c119.tar.bz2
sharkey-6b554c178b81f13f83a69b19d44b72b282a0c119.zip
merge: release 2025.4.2 (!1051)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1051 Approved-by: Hazelnoot <acomputerdog@gmail.com> Approved-by: Marie <github@yuugi.dev> Approved-by: Julia <julia@insertdomain.name>
Diffstat (limited to 'packages/backend/src/GlobalModule.ts')
-rw-r--r--packages/backend/src/GlobalModule.ts18
1 files changed, 8 insertions, 10 deletions
diff --git a/packages/backend/src/GlobalModule.ts b/packages/backend/src/GlobalModule.ts
index 7ca566477d..90dbdaf2a6 100644
--- a/packages/backend/src/GlobalModule.ts
+++ b/packages/backend/src/GlobalModule.ts
@@ -141,7 +141,7 @@ const $meta: Provider = {
for (const key in body.after) {
(meta as any)[key] = (body.after as any)[key];
}
- meta.proxyAccount = null; // joinなカラムは通常取ってこないので
+ meta.rootUser = null; // joinなカラムは通常取ってこないので
break;
}
default:
@@ -178,15 +178,13 @@ export class GlobalModule implements OnApplicationShutdown {
// Wait for all potential DB queries
await allSettled();
// And then disconnect from DB
- await Promise.all([
- this.db.destroy(),
- this.redisClient.disconnect(),
- this.redisForPub.disconnect(),
- this.redisForSub.disconnect(),
- this.redisForTimelines.disconnect(),
- this.redisForReactions.disconnect(),
- this.redisForRateLimit.disconnect(),
- ]);
+ await this.db.destroy();
+ this.redisClient.disconnect();
+ this.redisForPub.disconnect();
+ this.redisForSub.disconnect();
+ this.redisForTimelines.disconnect();
+ this.redisForReactions.disconnect();
+ this.redisForRateLimit.disconnect();
}
async onApplicationShutdown(signal: string): Promise<void> {