aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/live
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-12-30 15:05:14 +0100
committerChocobozzz <me@florianbigard.com>2022-12-30 15:05:14 +0100
commit54db8e3d5c09fedc82d8421529c81255760a5ac2 (patch)
tree5fc316042884ff6ae9b31e51be61819acc5b42c3 /server/lib/live
parentfc83f323a85112a0f71879b6936ecfbd34e7f2e6 (diff)
downloadPeerTube-54db8e3d5c09fedc82d8421529c81255760a5ac2.tar.gz
PeerTube-54db8e3d5c09fedc82d8421529c81255760a5ac2.tar.zst
PeerTube-54db8e3d5c09fedc82d8421529c81255760a5ac2.zip
Fix P2P with object storage
Diffstat (limited to 'server/lib/live')
-rw-r--r--server/lib/live/live-manager.ts4
-rw-r--r--server/lib/live/shared/muxing-session.ts2
2 files changed, 4 insertions, 2 deletions
diff --git a/server/lib/live/live-manager.ts b/server/lib/live/live-manager.ts
index 5e459f3c3..9ea983119 100644
--- a/server/lib/live/live-manager.ts
+++ b/server/lib/live/live-manager.ts
@@ -483,12 +483,12 @@ class LiveManager {
483 playlist.p2pMediaLoaderPeerVersion = P2P_MEDIA_LOADER_PEER_VERSION 483 playlist.p2pMediaLoaderPeerVersion = P2P_MEDIA_LOADER_PEER_VERSION
484 playlist.type = VideoStreamingPlaylistType.HLS 484 playlist.type = VideoStreamingPlaylistType.HLS
485 485
486 playlist.assignP2PMediaLoaderInfoHashes(video, allResolutions)
487
488 playlist.storage = CONFIG.OBJECT_STORAGE.ENABLED 486 playlist.storage = CONFIG.OBJECT_STORAGE.ENABLED
489 ? VideoStorage.OBJECT_STORAGE 487 ? VideoStorage.OBJECT_STORAGE
490 : VideoStorage.FILE_SYSTEM 488 : VideoStorage.FILE_SYSTEM
491 489
490 playlist.assignP2PMediaLoaderInfoHashes(video, allResolutions)
491
492 return playlist.save() 492 return playlist.save()
493 } 493 }
494 494
diff --git a/server/lib/live/shared/muxing-session.ts b/server/lib/live/shared/muxing-session.ts
index 6ec126955..25ecf1c64 100644
--- a/server/lib/live/shared/muxing-session.ts
+++ b/server/lib/live/shared/muxing-session.ts
@@ -262,6 +262,8 @@ class MuxingSession extends EventEmitter {
262 const url = await storeHLSFileFromFilename(this.streamingPlaylist, this.streamingPlaylist.playlistFilename) 262 const url = await storeHLSFileFromFilename(this.streamingPlaylist, this.streamingPlaylist.playlistFilename)
263 263
264 this.streamingPlaylist.playlistUrl = url 264 this.streamingPlaylist.playlistUrl = url
265 this.streamingPlaylist.assignP2PMediaLoaderInfoHashes(this.videoLive.Video, this.allResolutions)
266
265 await this.streamingPlaylist.save() 267 await this.streamingPlaylist.save()
266 } catch (err) { 268 } catch (err) {
267 logger.error('Cannot upload live master file to object storage.', { err, ...this.lTags() }) 269 logger.error('Cannot upload live master file to object storage.', { err, ...this.lTags() })