oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

enhance: ActivityPub 周りで 429 を受け取った際にリトライするように (MisskeyIO#324)

Browse source
This commit is contained in:
riku6460 2024-01-05 23:48:59 +09:00 • committed by GitHub
parent f1b7f3425e
commit 397e056b1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/core/activitypub/ApInboxService.ts
View file

@ -288,7 +288,7 @@ export class ApInboxService {
} catch (err) {
// 対象が4xxならスキップ
if (err instanceof StatusError) {
if (err.isClientError) {
if (!err.isRetryable) {
this.logger.warn(`Ignored announce target ${targetUri} - ${err.statusCode}`);
return;
}
@ -404,7 +404,7 @@ export class ApInboxService {
await this.apNoteService.createNote(note, resolver, silent);
return 'ok';
} catch (err) {
if (err instanceof StatusError && err.isClientError) {
if (err instanceof StatusError && !err.isRetryable) {
return `skip ${err.statusCode}`;
} else {
throw err;

2
packages/backend/src/core/activitypub/models/ApNoteService.ts
View file

@ -216,7 +216,7 @@ export class ApNoteService {
return { status: 'ok', res };
} catch (e) {
return {
status: (e instanceof StatusError && e.isClientError) ? 'permerror' : 'temperror',
status: (e instanceof StatusError && !e.isRetryable) ? 'permerror' : 'temperror',
};
}
};