OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove aws bug workaround 

This has been fixed in https://github.com/aws/aws-sdk-js-v3/pull/2835
pull/4497/head
Chocobozzz 2021-10-22 16:30:55 +02:00
parent 7fb2c60bbe
commit 532e6a4172
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/lib/activitypub/videos/shared/creator.ts
View File

@ -64,7 +64,6 @@ export class APVideoCreator extends APVideoAbstractBuilder {
return { autoBlacklisted, videoCreated } return { autoBlacklisted, videoCreated }
} catch (err) { } catch (err) {
// FIXME: Use rollback hook when https://github.com/sequelize/sequelize/pull/13038 is released // FIXME: Use rollback hook when https://github.com/sequelize/sequelize/pull/13038 is released
// Remove thumbnail
if (thumbnailModel) await thumbnailModel.removeThumbnail() if (thumbnailModel) await thumbnailModel.removeThumbnail()
throw err throw err

14
server/lib/object-storage/shared/client.ts
View File

@ -29,20 +29,6 @@ function getClient () {
: undefined : undefined
}) })
// FIXME: https://github.com/aws/aws-sdk-js-v3/issues/2445 workaround
s3Client.middlewareStack.add(
(next, _context) => (args: any) => {
if (typeof args.request?.body === 'string' && args.request.body.includes('CompletedMultipartUpload')) {
args.request.body = args.request.body.replace(/CompletedMultipartUpload/g, 'CompleteMultipartUpload')
}
return next(args)
},
{
step: 'build',
priority: 'high'
}
)
logger.info('Initialized S3 client %s with region %s.', getEndpoint(), OBJECT_STORAGE.REGION, lTags()) logger.info('Initialized S3 client %s with region %s.', getEndpoint(), OBJECT_STORAGE.REGION, lTags())
return s3Client return s3Client