Added a flash message if the getMeetings call times out (bigbluebutto…

…n#2232)
yomojomo · Oct 26, 2020 · 68716bc · 68716bc
1 parent 3880e93
commit 68716bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb
@@ -71,7 +71,13 @@ def server_rooms
     @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
@@ -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}"