[bbb-greenlight: 8/12] Added a flash message if the getMeetings call times out (#2232)




commit 68716bc6f3ed3a1daf3b78263d166424900859a1
Author: Ahmad Farhat <ahmad af farhat gmail com>
Date:   Mon Oct 26 14:38:19 2020 -0400

    Added a flash message if the getMeetings call times out (#2232)

 app/controllers/admins_controller.rb | 8 +++++++-
 config/locales/en.yml                | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb
index dbe8ef0..8bd5f57 100644
--- a/app/controllers/admins_controller.rb
+++ b/app/controllers/admins_controller.rb
@@ -71,7 +71,13 @@ class AdminsController < ApplicationController
     @order_column = params[:column] && params[:direction] != "none" ? params[:column] : "status"
     @order_direction = params[:direction] && params[:direction] != "none" ? params[:direction] : "DESC"
 
-    meetings = all_running_meetings[:meetings]
+    begin
+      meetings = all_running_meetings[:meetings]
+    rescue
+      flash[:alert] = I18n.t("administrator.rooms.timeout")
+      meetings = []
+    end
+
     @order_column = "created_at" if meetings.empty?
     @running_room_bbb_ids = meetings.pluck(:meetingID)
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c14ce71..0cbd6e4 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -173,6 +173,7 @@ en:
         enabled: Always Enabled
         optional: Optional
     rooms:
+      timeout: Due to the BigBlueButton Server request timing out, the information for status and 
participants may not be accurate
       title: Server Rooms
       table:
         ended: "Ended: %{session}"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]