From 7500d6c9000b531fda1fd64e188b7cf83803941a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jun 2021 18:06:58 +0200 Subject: Use a global request timeout --- server/lib/job-queue/handlers/activitypub-http-broadcast.ts | 3 +-- server/lib/job-queue/handlers/activitypub-http-unicast.ts | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'server/lib/job-queue') diff --git a/server/lib/job-queue/handlers/activitypub-http-broadcast.ts b/server/lib/job-queue/handlers/activitypub-http-broadcast.ts index c69ff9e83..d4b328635 100644 --- a/server/lib/job-queue/handlers/activitypub-http-broadcast.ts +++ b/server/lib/job-queue/handlers/activitypub-http-broadcast.ts @@ -3,7 +3,7 @@ import * as Bull from 'bull' import { ActivitypubHttpBroadcastPayload } from '@shared/models' import { logger } from '../../../helpers/logger' import { doRequest } from '../../../helpers/requests' -import { BROADCAST_CONCURRENCY, REQUEST_TIMEOUT } from '../../../initializers/constants' +import { BROADCAST_CONCURRENCY } from '../../../initializers/constants' import { ActorFollowScoreCache } from '../../files-cache' import { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from './utils/activitypub-http-utils' @@ -19,7 +19,6 @@ async function processActivityPubHttpBroadcast (job: Bull.Job) { method: 'POST' as 'POST', json: body, httpSignature: httpSignatureOptions, - timeout: REQUEST_TIMEOUT, headers: buildGlobalHeaders(body) } diff --git a/server/lib/job-queue/handlers/activitypub-http-unicast.ts b/server/lib/job-queue/handlers/activitypub-http-unicast.ts index 585dad671..9e561c6b7 100644 --- a/server/lib/job-queue/handlers/activitypub-http-unicast.ts +++ b/server/lib/job-queue/handlers/activitypub-http-unicast.ts @@ -2,7 +2,6 @@ import * as Bull from 'bull' import { ActivitypubHttpUnicastPayload } from '@shared/models' import { logger } from '../../../helpers/logger' import { doRequest } from '../../../helpers/requests' -import { REQUEST_TIMEOUT } from '../../../initializers/constants' import { ActorFollowScoreCache } from '../../files-cache' import { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from './utils/activitypub-http-utils' @@ -19,7 +18,6 @@ async function processActivityPubHttpUnicast (job: Bull.Job) { method: 'POST' as 'POST', json: body, httpSignature: httpSignatureOptions, - timeout: REQUEST_TIMEOUT, headers: buildGlobalHeaders(body) } -- cgit v1.2.3