Merge pull request #63 from mconf/master

Resync up to v2.4.19
bigbluebutton · Sep 15, 2020 · 2b77265 · 2b77265
2 parents 2a6343f + e8f46ac
commit 2b77265
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/config/custom-environment-variables.yml b/config/custom-environment-variables.yml
@@ -80,6 +80,11 @@ kurentoAllowedCandidateIps:
   __name: KURENTO_ALLOWED_CANDIDATE_IPS
   __format: json
 
+mediaThresholds:
+  global: GLOBAL_MEDIA_THRESHOLD
+  perRoom: ROOM_MEDIA_THRESHOLD
+  perUser: USER_MEDIA_THRESHOLD
+
 addTimestampToAkkaMessages:
   __name: AKKA_MSG_TIMESTAMP
   __format: json
diff --git a/lib/mcs-core/lib/media/media-controller.js b/lib/mcs-core/lib/media/media-controller.js
@@ -293,7 +293,7 @@ module.exports = class MediaController {
     }
 
     if (!params.ignoreThresholds && this.isAboveMediaThresholds(room, user)) {
-      return reject(this._handleError({
+      throw (this._handleError({
         ...C.ERROR.MEDIA_SERVER_NO_RESOURCES,
         details: `Threshold exceeded. Threshold: ${GLOBAL_MEDIA_THRESHOLD}`,
       }));

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bbb-webrtc-sfu",
-  "version": "2.4.17",
+  "version": "2.4.19",
   "private": true,
   "scripts": {
     "start": "node server.js",