diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2021-10-25 17:42:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-25 17:42:20 +0200 |
commit | 276250f0a36e00373166d91d539e5220d6f158c7 (patch) | |
tree | 394e4fd65912edbbe9266ccfbacfc14f433371e7 /server/initializers | |
parent | b2ad0090c182c7f2a8cba1cced3987d408a4b159 (diff) | |
download | PeerTube-276250f0a36e00373166d91d539e5220d6f158c7.tar.gz PeerTube-276250f0a36e00373166d91d539e5220d6f158c7.tar.zst PeerTube-276250f0a36e00373166d91d539e5220d6f158c7.zip |
prevent multiple post-process triggering of upload-resumable (#4175)
* prevent multiple post-process triggering of upload-resumable
* switch from 409 to 503 for upload being processed
* Improve resumable upload check
Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'server/initializers')
-rw-r--r-- | server/initializers/constants.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 87a74a32c..f6c19dab4 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
@@ -665,6 +665,8 @@ const RESUMABLE_UPLOAD_DIRECTORY = join(CONFIG.STORAGE.TMP_DIR, 'resumable-uploa | |||
665 | const HLS_STREAMING_PLAYLIST_DIRECTORY = join(CONFIG.STORAGE.STREAMING_PLAYLISTS_DIR, 'hls') | 665 | const HLS_STREAMING_PLAYLIST_DIRECTORY = join(CONFIG.STORAGE.STREAMING_PLAYLISTS_DIR, 'hls') |
666 | const HLS_REDUNDANCY_DIRECTORY = join(CONFIG.STORAGE.REDUNDANCY_DIR, 'hls') | 666 | const HLS_REDUNDANCY_DIRECTORY = join(CONFIG.STORAGE.REDUNDANCY_DIR, 'hls') |
667 | 667 | ||
668 | const RESUMABLE_UPLOAD_SESSION_LIFETIME = SCHEDULER_INTERVALS_MS.REMOVE_DANGLING_RESUMABLE_UPLOADS | ||
669 | |||
668 | const VIDEO_LIVE = { | 670 | const VIDEO_LIVE = { |
669 | EXTENSION: '.ts', | 671 | EXTENSION: '.ts', |
670 | CLEANUP_DELAY: 1000 * 60 * 5, // 5 minutes | 672 | CLEANUP_DELAY: 1000 * 60 * 5, // 5 minutes |
@@ -838,6 +840,7 @@ export { | |||
838 | LAZY_STATIC_PATHS, | 840 | LAZY_STATIC_PATHS, |
839 | SEARCH_INDEX, | 841 | SEARCH_INDEX, |
840 | RESUMABLE_UPLOAD_DIRECTORY, | 842 | RESUMABLE_UPLOAD_DIRECTORY, |
843 | RESUMABLE_UPLOAD_SESSION_LIFETIME, | ||
841 | HLS_REDUNDANCY_DIRECTORY, | 844 | HLS_REDUNDANCY_DIRECTORY, |
842 | P2P_MEDIA_LOADER_PEER_VERSION, | 845 | P2P_MEDIA_LOADER_PEER_VERSION, |
843 | ACTOR_IMAGES_SIZE, | 846 | ACTOR_IMAGES_SIZE, |