diff options
author | Chocobozzz <me@florianbigard.com> | 2018-10-11 09:52:16 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-10-11 09:52:16 +0200 |
commit | 71e318b4fe66175d03c7c82357d60062eb68af81 (patch) | |
tree | 1e6bbfa16c9aab32174ec2a87b44f357d5382f07 /server/lib/job-queue/handlers/activitypub-http-broadcast.ts | |
parent | cc1903ad2a16adf14eaa4f5429e35c455cf93bea (diff) | |
parent | 333210d862fdba4bb114b756d4f964789f480196 (diff) | |
download | PeerTube-71e318b4fe66175d03c7c82357d60062eb68af81.tar.gz PeerTube-71e318b4fe66175d03c7c82357d60062eb68af81.tar.zst PeerTube-71e318b4fe66175d03c7c82357d60062eb68af81.zip |
Merge branch 'release/v1.0.0' into develop
Diffstat (limited to 'server/lib/job-queue/handlers/activitypub-http-broadcast.ts')
-rw-r--r-- | server/lib/job-queue/handlers/activitypub-http-broadcast.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/lib/job-queue/handlers/activitypub-http-broadcast.ts b/server/lib/job-queue/handlers/activitypub-http-broadcast.ts index 03a9e12a4..abbd89b3b 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 Bluebird from 'bluebird' | |||
3 | import { logger } from '../../../helpers/logger' | 3 | import { logger } from '../../../helpers/logger' |
4 | import { doRequest } from '../../../helpers/requests' | 4 | import { doRequest } from '../../../helpers/requests' |
5 | import { ActorFollowModel } from '../../../models/activitypub/actor-follow' | 5 | import { ActorFollowModel } from '../../../models/activitypub/actor-follow' |
6 | import { buildSignedRequestOptions, computeBody } from './utils/activitypub-http-utils' | 6 | import { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from './utils/activitypub-http-utils' |
7 | import { BROADCAST_CONCURRENCY, JOB_REQUEST_TIMEOUT } from '../../../initializers' | 7 | import { BROADCAST_CONCURRENCY, JOB_REQUEST_TIMEOUT } from '../../../initializers' |
8 | 8 | ||
9 | export type ActivitypubHttpBroadcastPayload = { | 9 | export type ActivitypubHttpBroadcastPayload = { |
@@ -25,7 +25,8 @@ async function processActivityPubHttpBroadcast (job: Bull.Job) { | |||
25 | uri: '', | 25 | uri: '', |
26 | json: body, | 26 | json: body, |
27 | httpSignature: httpSignatureOptions, | 27 | httpSignature: httpSignatureOptions, |
28 | timeout: JOB_REQUEST_TIMEOUT | 28 | timeout: JOB_REQUEST_TIMEOUT, |
29 | headers: buildGlobalHeaders(body) | ||
29 | } | 30 | } |
30 | 31 | ||
31 | const badUrls: string[] = [] | 32 | const badUrls: string[] = [] |