lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4 from joshua-arts/loadbalanced 

Add ability to launch through a loadbalanced BBB configuration.
This commit is contained in:
Joshua Arts 2018-06-29 09:26:20 -04:00 committed by GitHub
parent 840c677c5e 056289789a
commit 924ba7256b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/models/room.rb
View File

@ -141,13 +141,12 @@ class Room < ApplicationRecord
# Sets a BigBlueButtonApi object for interacting with the API. # Sets a BigBlueButtonApi object for interacting with the API.
def bbb def bbb
@bbb ||= BigBlueButton::BigBlueButtonApi.new(remove_slash(bbb_endpoint), bbb_secret, "0.8") @bbb ||= if Rails.configuration.loadbalanced_configuration
# @bbb ||= if Rails.configuration.loadbalanced_configuration lb_user = retrieve_loadbalanced_credentials(owner.provider)
# lb_user = retrieve_loadbalanced_credentials(self.room.owner.provider) BigBlueButton::BigBlueButtonApi.new(remove_slash(lb_user["apiURL"]), lb_user["secret"], "0.8")
# BigBlueButton::BigBlueButtonApi.new(remove_slash(lb_user["apiURL"]), lb_user["secret"], "0.8") else
# else BigBlueButton::BigBlueButtonApi.new(remove_slash(bbb_endpoint), bbb_secret, "0.8")
# BigBlueButton::BigBlueButtonApi.new(remove_slash(bbb_endpoint), bbb_secret, "0.8") end
# end
end end
# Generates a uid for the room and BigBlueButton. # Generates a uid for the room and BigBlueButton.
@ -174,7 +173,7 @@ class Room < ApplicationRecord
# Build the URI. # Build the URI.
uri = encode_bbb_url( uri = encode_bbb_url(
Rails.configuration.loadbalancer_endpoint, Rails.configuration.loadbalancer_endpoint + "getUser",
Rails.configuration.loadbalancer_secret, Rails.configuration.loadbalancer_secret,
name: provider name: provider
) )

2
config/application.rb
View File

@ -17,7 +17,7 @@ module Greenlight
# Use custom error routes. # Use custom error routes.
config.exceptions_app = routes config.exceptions_app = routes
config.loadbalanced_configuration = (ENV["USE_LOADBALANCED_CONFIGURATION"] == "true") config.loadbalanced_configuration = ENV["LOADBALANCER_ENDPOINT"].present? && ENV["LOADBALANCER_SECRET"].present?
# Setup BigBlueButton configuration. # Setup BigBlueButton configuration.
if config.loadbalanced_configuration if config.loadbalanced_configuration