diff options
Diffstat (limited to 'server/lib')
-rw-r--r-- | server/lib/live/shared/muxing-session.ts | 12 |
1 files changed, 5 insertions, 7 deletions
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' | |||
8 | import { logger, loggerTagsFactory, LoggerTagsFn } from '@server/helpers/logger' | 8 | import { logger, loggerTagsFactory, LoggerTagsFn } from '@server/helpers/logger' |
9 | import { CONFIG } from '@server/initializers/config' | 9 | import { CONFIG } from '@server/initializers/config' |
10 | import { MEMOIZE_TTL, P2P_MEDIA_LOADER_PEER_VERSION, VIDEO_LIVE } from '@server/initializers/constants' | 10 | import { MEMOIZE_TTL, P2P_MEDIA_LOADER_PEER_VERSION, VIDEO_LIVE } from '@server/initializers/constants' |
11 | import { | 11 | import { removeHLSFileObjectStorageByPath, storeHLSFileFromContent, storeHLSFileFromPath } from '@server/lib/object-storage' |
12 | removeHLSFileObjectStorageByPath, | ||
13 | storeHLSFileFromContent, | ||
14 | storeHLSFileFromFilename, | ||
15 | storeHLSFileFromPath | ||
16 | } from '@server/lib/object-storage' | ||
17 | import { VideoFileModel } from '@server/models/video/video-file' | 12 | import { VideoFileModel } from '@server/models/video/video-file' |
18 | import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist' | 13 | import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist' |
19 | import { MStreamingPlaylistVideo, MUserId, MVideoLiveVideo } from '@server/types/models' | 14 | import { MStreamingPlaylistVideo, MUserId, MVideoLiveVideo } from '@server/types/models' |
@@ -190,7 +185,10 @@ class MuxingSession extends EventEmitter { | |||
190 | 185 | ||
191 | try { | 186 | try { |
192 | if (this.streamingPlaylist.storage === VideoStorage.OBJECT_STORAGE) { | 187 | if (this.streamingPlaylist.storage === VideoStorage.OBJECT_STORAGE) { |
193 | const url = await storeHLSFileFromFilename(this.streamingPlaylist, this.streamingPlaylist.playlistFilename) | 188 | const masterContent = await readFile(path, 'utf-8') |
189 | logger.debug('Uploading live master playlist on object storage for %s', this.videoUUID, { masterContent, ...this.lTags() }) | ||
190 | |||
191 | const url = await storeHLSFileFromContent(this.streamingPlaylist, this.streamingPlaylist.playlistFilename, masterContent) | ||
194 | 192 | ||
195 | this.streamingPlaylist.playlistUrl = url | 193 | this.streamingPlaylist.playlistUrl = url |
196 | } | 194 | } |