Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Merge pull request #86 from MisskeyIO/revert-bullmq"

Browse source 
This reverts commit e8cf53a1ea.

Revert "外部サーバーへの配送が行われない問題を修正 (たぶん) (#98)"

This reverts commit 53931ec59a.

Revert "fix(backend): restore start method in QueueProcessorService (#87)"

This reverts commit e88617e3c3.
This commit is contained in:
riku6460 2023-06-15 11:40:50 +09:00 • committed by まっちゃとーにゅ
parent eca41ca472
commit 757eae25bf
No known key found for this signature in database
GPG key ID: 6AFBBF529601C1DB
41 changed files with 540 additions and 510 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/queue/processors/DeliverProcessorService.ts
View file

@ -1,4 +1,5 @@
import { Inject, Injectable } from '@nestjs/common';
import * as Bull from 'bullmq';
import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository, InstancesRepository } from '@/models/index.js';
import type { Config } from '@/config.js';
@ -16,7 +17,6 @@ import { StatusError } from '@/misc/status-error.js';
import { UtilityService } from '@/core/UtilityService.js';
import { bindThis } from '@/decorators.js';
import { QueueLoggerService } from '../QueueLoggerService.js';
import type Bull from 'bull';
import type { DeliverJobData } from '../types.js';
@Injectable()
@ -121,11 +121,9 @@ export class DeliverProcessorService {
isSuspended: true,
});
});
return `${host} is gone`;
throw new Bull.UnrecoverableError(`${host} is gone`);
}
// HTTPステータスコード4xxはクライアントエラーであり、それはつまり
// 何回再送しても成功することはないということなのでエラーにはしないでおく
return `${res.statusCode} ${res.statusMessage}`;
throw new Bull.UnrecoverableError(`${res.statusCode} ${res.statusMessage}`);
}
// 5xx etc.