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

delay webhooks destroy

Browse Source
This commit is contained in:
Josh 2017-06-30 15:57:54 -04:00
parent 89b733f633
commit 44e2cb7027
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/bbb_controller.rb
View File

@ -279,12 +279,6 @@ class BbbController < ApplicationController
owner = User.find_by(encrypted_id: room_id) owner = User.find_by(encrypted_id: room_id)
RecordingReadyEmailJob.perform_later(owner, parse_recording_for_view(rec_info)) if owner.present? RecordingReadyEmailJob.perform_later(owner, parse_recording_for_view(rec_info)) if owner.present?
end end
# TODO: remove the webhook now that the meeting and recording are done
# remove only if the meeting is not running, otherwise the hook is needed
# if Rails.configuration.use_webhooks
# webhook_remove("#{base_url}/callback")
# end
else else
logger.error "Bad format for event #{event}, won't process" logger.error "Bad format for event #{event}, won't process"
end end
@ -293,6 +287,10 @@ class BbbController < ApplicationController
actioncable_event('create', params['id'], params['room_id']) actioncable_event('create', params['id'], params['room_id'])
elsif eventName == "meeting_destroyed_event" elsif eventName == "meeting_destroyed_event"
actioncable_event('destroy', params['id'], params['room_id']) actioncable_event('destroy', params['id'], params['room_id'])
record_id = event['payload']['meeting_id'].split('-')[0]
rec_info = bbb_get_recordings({recordID: record_id})
rec_info = rec_info[:recordings].first
webhook_remove(rec_info[:metadata][:"gl-webhooks-callback-url"])
elsif eventName == "user_joined_message" elsif eventName == "user_joined_message"
actioncable_event('join', params['id'], params['room_id'], event['payload']['user']['role']) actioncable_event('join', params['id'], params['room_id'], event['payload']['user']['role'])
elsif eventName == "user_left_message" elsif eventName == "user_left_message"

5
app/lib/bbb_api.rb
View File

@ -188,11 +188,6 @@ module BbbApi
meeting_id = bbb_meeting_id(id) meeting_id = bbb_meeting_id(id)
bbb_meeting_info = bbb.get_meeting_info(meeting_id, nil) bbb_meeting_info = bbb.get_meeting_info(meeting_id, nil)
# Remove the webhook when the meeting ends.
if Rails.configuration.use_webhooks
webhook_remove(bbb_meeting_info[:metadata][:"gl-webhooks-callback-url"])
end
response_data = if bbb_meeting_info.is_a?(Hash) && bbb_meeting_info[:moderatorPW] response_data = if bbb_meeting_info.is_a?(Hash) && bbb_meeting_info[:moderatorPW]
bbb.end_meeting(meeting_id, bbb_meeting_info[:moderatorPW]) bbb.end_meeting(meeting_id, bbb_meeting_info[:moderatorPW])
else else