Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix stuck S3 client

Chocobozzz10c5f44e1a91
diff --git a/server/core/lib/object-storage/videos.ts b/server/core/lib/object-storage/videos.ts
index 6575b714b8..0336245699 100644
--- a/server/core/lib/object-storage/videos.ts
+++ b/server/core/lib/object-storage/videos.ts
@@ -160,6 +160,8 @@ export async function makeHLSFileAvailable (playlist: MStreamingPlaylistVideo, f
bucketInfo: CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS
})
+ logger.debug('Fetched HLS file %s from object storage to %s.', key, destination, lTags())
+
return destination
}
diff --git a/server/core/lib/video-file.ts b/server/core/lib/video-file.ts
index 5a0e2f801a..9f74801839 100644
--- a/server/core/lib/video-file.ts
+++ b/server/core/lib/video-file.ts
@@ -334,6 +334,12 @@ export async function muxToMergeVideoFiles (options: {
for (const destination of tmpDestinations) {
await remove(destination)
}
+
+ for (const input of inputs) {
+ if (input instanceof Readable) {
+ if (!input.destroyed) input.destroy()
+ }
+ }
}
}