From: Chocobozzz <me@florianbigard.com>
Date: Thu, 25 May 2023 07:58:08 +0000 (+0200)
Subject: Add more logs when storing master playlist in s3
X-Git-Tag: v5.2.0-rc.1~23
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a60b1006019758ea7ffb7f62714dda08f0a28911;p=github%2FChocobozzz%2FPeerTube.git

Add more logs when storing master playlist in s3
---

diff --git a/server/lib/live/shared/muxing-session.ts b/server/lib/live/shared/muxing-session.ts
index 434b308e6..02691b651 100644
--- a/server/lib/live/shared/muxing-session.ts
+++ b/server/lib/live/shared/muxing-session.ts
@@ -8,12 +8,7 @@ import { computeOutputFPS } from '@server/helpers/ffmpeg'
 import { logger, loggerTagsFactory, LoggerTagsFn } from '@server/helpers/logger'
 import { CONFIG } from '@server/initializers/config'
 import { MEMOIZE_TTL, P2P_MEDIA_LOADER_PEER_VERSION, VIDEO_LIVE } from '@server/initializers/constants'
-import {
-  removeHLSFileObjectStorageByPath,
-  storeHLSFileFromContent,
-  storeHLSFileFromFilename,
-  storeHLSFileFromPath
-} from '@server/lib/object-storage'
+import { removeHLSFileObjectStorageByPath, storeHLSFileFromContent, storeHLSFileFromPath } from '@server/lib/object-storage'
 import { VideoFileModel } from '@server/models/video/video-file'
 import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
 import { MStreamingPlaylistVideo, MUserId, MVideoLiveVideo } from '@server/types/models'
@@ -190,7 +185,10 @@ class MuxingSession extends EventEmitter {
 
       try {
         if (this.streamingPlaylist.storage === VideoStorage.OBJECT_STORAGE) {
-          const url = await storeHLSFileFromFilename(this.streamingPlaylist, this.streamingPlaylist.playlistFilename)
+          const masterContent = await readFile(path, 'utf-8')
+          logger.debug('Uploading live master playlist on object storage for %s', this.videoUUID, { masterContent, ...this.lTags() })
+
+          const url = await storeHLSFileFromContent(this.streamingPlaylist, this.streamingPlaylist.playlistFilename, masterContent)
 
           this.streamingPlaylist.playlistUrl = url
         }