graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-24 20:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2019-03-09 10:09:12 +09:00
commit a179cfd69a
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/queue/index.ts
View file

@ -25,6 +25,26 @@ export const deliverQueue = initializeQueue('deliver');
export const inboxQueue = initializeQueue('inbox');
export const dbQueue = initializeQueue('db');
deliverQueue
.on('waiting', (jobId) => {
queueLogger.debug(`[deliver] waiting id=${jobId}`);
})
.on('active', (job) => {
queueLogger.debug(`[deliver] active id=${job.id} to=${job.data.to}`);
})
.on('completed', (job, result) => {
queueLogger.debug(`[deliver] completed(${result}) id=${job.id} to=${job.data.to}`);
})
.on('failed', (job, err) => {
queueLogger.debug(`[deliver] failed(${err}) id=${job.id} to=${job.data.to}`);
})
.on('error', (error) => {
queueLogger.error(`[deliver] error ${error}`);
})
.on('stalled', (job) => {
queueLogger.warn(`[deliver] stalled id=${job.id} to=${job.data.to}`);
});
export function deliver(user: ILocalUser, content: any, to: any) {
if (content == null) return null;
@ -38,7 +58,7 @@ export function deliver(user: ILocalUser, content: any, to: any) {
attempts: 8,
backoff: {
type: 'exponential',
delay: 1000
delay: 60 * 1000
},
removeOnComplete: true,
removeOnFail: true

12
src/queue/processors/deliver.ts
View file

@ -7,7 +7,7 @@ import instanceChart from '../../services/chart/instance';
let latest: string = null;
export default async (job: Bull.Job): Promise<void> => {
export default async (job: Bull.Job) => {
const { host } = new URL(job.data.to);
try {
@ -29,6 +29,8 @@ export default async (job: Bull.Job): Promise<void> => {
instanceChart.requestSent(i.host, true);
});
return 'Success';
} catch (res) {
// Update stats
registerOrFetchInstanceDoc(host).then(i => {
@ -46,15 +48,19 @@ export default async (job: Bull.Job): Promise<void> => {
if (res != null && res.hasOwnProperty('statusCode')) {
queueLogger.warn(`deliver failed: ${res.statusCode} ${res.statusMessage} to=${job.data.to}`);
// 4xx
if (res.statusCode >= 400 && res.statusCode < 500) {
// HTTPステータスコード4xxはクライアントエラーであり、それはつまり
// 何回再送しても成功することはないということなのでエラーにはしないでおく
return;
return `${res.statusCode} ${res.statusMessage}`;
}
return res.statusMessage;
// 5xx etc.
throw `${res.statusCode} ${res.statusMessage}`;
} else {
// DNS error, socket error, timeout ...
queueLogger.warn(`deliver failed: ${res} to=${job.data.to}`);
throw res;
}
}
};