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

log non-fatal errors in AccountMoveService

Browse source
This commit is contained in:
Hazelnoot 2025-09-14 09:42:22 -04:00
parent 39bdd691e8
commit db581d2ea9
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
packages/backend/src/core/AccountMoveService.ts
View file

@ -30,9 +30,14 @@ import { CacheService } from '@/core/CacheService.js';
import { UserListService } from '@/core/UserListService.js'; import { UserListService } from '@/core/UserListService.js';
import { TimeService } from '@/global/TimeService.js'; import { TimeService } from '@/global/TimeService.js';
import { InternalEventService } from '@/global/InternalEventService.js'; import { InternalEventService } from '@/global/InternalEventService.js';
import { LoggerService } from '@/core/LoggerService.js';
import type Logger from '@/logger.js';
import { renderInlineError } from '@/misc/render-inline-error.js';
@Injectable() @Injectable()
export class AccountMoveService { export class AccountMoveService {
private readonly logger: Logger;
constructor( constructor(
@Inject(DI.meta) @Inject(DI.meta)
private meta: MiMeta, private meta: MiMeta,
@ -76,7 +81,9 @@ export class AccountMoveService {
private readonly userListService: UserListService, private readonly userListService: UserListService,
private readonly timeService: TimeService, private readonly timeService: TimeService,
private readonly internalEventService: InternalEventService, private readonly internalEventService: InternalEventService,
private readonly loggerService: LoggerService,
) { ) {
this.logger = this.loggerService.getLogger('account-move');
} }
/** /**
@ -130,7 +137,7 @@ export class AccountMoveService {
public async postMoveProcess(src: MiUser, dst: MiUser): Promise<void> { public async postMoveProcess(src: MiUser, dst: MiUser): Promise<void> {
// Copy blockings and mutings, and update lists // Copy blockings and mutings, and update lists
try { try {
await Promise.all([ const results = await Promise.allSettled([
this.copyBlocking(src, dst), this.copyBlocking(src, dst),
this.copyMutings(src, dst), this.copyMutings(src, dst),
this.deleteScheduledNotes(src), this.deleteScheduledNotes(src),
@ -138,8 +145,16 @@ export class AccountMoveService {
this.updateLists(src, dst), this.updateLists(src, dst),
this.antennaService.onMoveAccount(src, dst), this.antennaService.onMoveAccount(src, dst),
]); ]);
} catch {
// Log errors, but keep moving
for (const result of results) {
if (result.status === 'rejected') {
this.logger.warn(`Non-fatal exception in migration from ${src.id} (@${src.usernameLower}@${src.host}) to ${dst.id} (@${dst.usernameLower}@${dst.host}): ${renderInlineError(result.reason)}`);
}
}
} catch (err) {
/* skip if any error happens */ /* skip if any error happens */
this.logger.warn(`Non-fatal exception in migration from ${src.id} (@${src.usernameLower}@${src.host}) to ${dst.id} (@${dst.usernameLower}@${dst.host}): ${renderInlineError(err)}`);
} }
// follow the new account // follow the new account
@ -155,8 +170,9 @@ export class AccountMoveService {
// Decrease following count instead of unfollowing. // Decrease following count instead of unfollowing.
try { try {
await this.adjustFollowingCounts(followJobs.map(job => job.from.id), src); await this.adjustFollowingCounts(followJobs.map(job => job.from.id), src);
} catch { } catch (err) {
/* skip if any error happens */ /* skip if any error happens */
this.logger.warn(`Non-fatal exception in migration from ${src.id} (@${src.usernameLower}@${src.host}) to ${dst.id} (@${dst.usernameLower}@${dst.host}): ${renderInlineError(err)}`);
} }
// Should be queued because this can cause a number of follow per one move. // Should be queued because this can cause a number of follow per one move.