Fix peertube runner concurrency

[github/Chocobozzz/PeerTube.git] / server / initializers / constants.ts

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 1dfc9fb27efb089adefede8a87e2627e47205234..85944fa3a420fe1cd5950c0745987a61f52f778f 100644 (file)
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -55,8 +55,12 @@ const WEBSERVER = {
   WS: '',
   HOSTNAME: '',
   PORT: 0,
+
   RTMP_URL: '',
-  RTMPS_URL: ''
+  RTMPS_URL: '',
+
+  RTMP_BASE_LIVE_URL: '',
+  RTMPS_BASE_LIVE_URL: ''
 }
 
 // Sortable columns per schema
@@ -253,7 +257,8 @@ const JOB_REMOVAL_OPTIONS = {
 const VIDEO_IMPORT_TIMEOUT = Math.floor(JOB_TTL['video-import'] * 0.9)
 
 const RUNNER_JOBS = {
-  MAX_FAILURES: 5
+  MAX_FAILURES: 5,
+  LAST_CONTACT_UPDATE_INTERVAL: 30000
 }
 
 // ---------------------------------------------------------------------------
@@ -1030,6 +1035,8 @@ if (process.env.PRODUCTION_CONSTANTS !== 'true') {
     VIDEO_LIVE.SEGMENT_TIME_SECONDS.DEFAULT_LATENCY = 2
     VIDEO_LIVE.SEGMENT_TIME_SECONDS.SMALL_LATENCY = 1
     VIDEO_LIVE.EDGE_LIVE_DELAY_SEGMENTS_NOTIFICATION = 1
+
+    RUNNER_JOBS.LAST_CONTACT_UPDATE_INTERVAL = 2000
   }
 }
 
@@ -1242,8 +1249,11 @@ function updateWebserverUrls () {
   const rtmpHostname = CONFIG.LIVE.RTMP.PUBLIC_HOSTNAME || CONFIG.WEBSERVER.HOSTNAME
   const rtmpsHostname = CONFIG.LIVE.RTMPS.PUBLIC_HOSTNAME || CONFIG.WEBSERVER.HOSTNAME
 
-  WEBSERVER.RTMP_URL = 'rtmp://' + rtmpHostname + ':' + CONFIG.LIVE.RTMP.PORT + '/' + VIDEO_LIVE.RTMP.BASE_PATH
-  WEBSERVER.RTMPS_URL = 'rtmps://' + rtmpsHostname + ':' + CONFIG.LIVE.RTMPS.PORT + '/' + VIDEO_LIVE.RTMP.BASE_PATH
+  WEBSERVER.RTMP_URL = 'rtmp://' + rtmpHostname + ':' + CONFIG.LIVE.RTMP.PORT
+  WEBSERVER.RTMPS_URL = 'rtmps://' + rtmpsHostname + ':' + CONFIG.LIVE.RTMPS.PORT
+
+  WEBSERVER.RTMP_BASE_LIVE_URL = WEBSERVER.RTMP_URL + '/' + VIDEO_LIVE.RTMP.BASE_PATH
+  WEBSERVER.RTMPS_BASE_LIVE_URL = WEBSERVER.RTMPS_URL + '/' + VIDEO_LIVE.RTMP.BASE_PATH
 }
 
 function updateWebserverConfig () {