Merge branch 'develop' into add-server-protocol-guard

app/controllers/bigbluebutton_api_controller.rb

@@ -331,7 +331,7 @@ def get_recordings
       raise BBBError.new('missingParameters', 'param meetingID or recordID must be included.')
     end
 
-    query = Recording.includes(playback_formats: [:thumbnails], metadata: []).left_joins(:metadata)
+    query = Recording.includes(playback_formats: [:thumbnails], metadata: []).left_joins(:metadata).distinct
 
     query = query.where(metadata: { key: "tenant-id", value: @tenant.id }) if @tenant.present?
 

app/models/meeting.rb

@@ -277,13 +277,8 @@ def self.all(tenant_id = nil)
         hash = redis.hgetall(key(id))
         next if hash.blank?
 
-        if tenant_id.present?
-          # Only fetch meetings for particular Tenant
-          next if tenant_id != hash['tenant_id']
-        elsif hash['tenant_id'].present?
-          next
-        end
-        # Only fetch meetings without Tenant
+        # If tenant_id given, only fetch meetings for particular Tenant
+        next if tenant_id.present? && hash['tenant_id'] != tenant_id
 
         hash[:id] = id
         meetings << new.init_with_attributes(hash)

config/application.rb

@@ -107,7 +107,7 @@ class Application < Rails::Application
     config.x.recording_import_unpublished = ENV.fetch('RECORDING_IMPORT_UNPUBLISHED', 'false').casecmp?('true')
 
     # Multitenancy values
-    config.x.multitenancy_enabled = ENV.fetch('MULTITENANCY_ENABLED', nil)
+    config.x.multitenancy_enabled = ENV.fetch('MULTITENANCY_ENABLED', 'false').casecmp?('true')
 
     # Scalelite Host name
     config.x.url_host = ENV.fetch('URL_HOST', nil)

lib/tasks/poll.rake

@@ -96,10 +96,26 @@ namespace :poll do
         next if server.increment_unhealthy < Rails.configuration.x.server_unhealthy_threshold
 
         Rails.logger.warn("Server id=#{server.id} is unhealthy. Panicking and setting offline...")
-        Rake::Task['servers:panic'].invoke(server.id, true) # Panic server to clear meetings
+
+        meetings = Meeting.all.select { |m| m.server_id == server.id }
+        meetings.each do |meeting|
+          puts("Clearing Meeting id=#{meeting.id}")
+          moderator_pw = meeting.try(:moderator_pw)
+          meeting.destroy!
+          get_post_req(encode_bbb_uri('end', server.url, server.secret, meetingID: meeting.id, password: moderator_pw))
+        rescue ApplicationRedisRecord::RecordNotDestroyed => e
+          raise("ERROR: Could not destroy meeting id=#{meeting.id}: #{e}")
+        rescue StandardError => e
+          puts("WARNING: Could not end meeting id=#{meeting.id}: #{e}")
+        end
+
         server.reset_counters
         server.load = nil
         server.online = false
+        server.meetings = 0
+        server.users = 0
+        server.largest_meeting = 0
+        server.videos = 0
       ensure
         begin
           server.save!

lib/tasks/servers.rake

@@ -62,6 +62,7 @@ namespace :servers do
     puts('OK')
   rescue ApplicationRedisRecord::RecordNotFound
     puts("ERROR: No server found with id: #{args.id}")
+    exit(1)
   end
 
   desc 'Remove a BigBlueButton server'
@@ -71,6 +72,7 @@ namespace :servers do
     puts('OK')
   rescue ApplicationRedisRecord::RecordNotFound
     puts("ERROR: No server found with id: #{args.id}")
+    exit(1)
   end
 
   desc 'Mark a BigBlueButton server as available for scheduling new meetings'
@@ -81,6 +83,7 @@ namespace :servers do
     puts('OK')
   rescue ApplicationRedisRecord::RecordNotFound
     puts("ERROR: No server found with id: #{args.id}")
+    exit(1)
   end
 
   desc 'Mark a BigBlueButton server as cordoned to stop scheduling new meetings but consider for
@@ -92,6 +95,7 @@ namespace :servers do
     puts('OK')
   rescue ApplicationRedisRecord::RecordNotFound
     puts("ERROR: No server found with id: #{args.id}")
+    exit(1)
   end
 
   desc 'Mark a BigBlueButton server as unavailable to stop scheduling new meetings'
@@ -123,6 +127,7 @@ namespace :servers do
     puts('OK')
   rescue ApplicationRedisRecord::RecordNotFound
     puts("ERROR: No server found with id: #{args.id}")
+    exit(1)
   end
 
   desc 'Mark a BigBlueButton server as unavailable, and clear all meetings from it'
@@ -148,6 +153,7 @@ namespace :servers do
     puts('OK')
   rescue ApplicationRedisRecord::RecordNotFound
     puts("ERROR: No server found with id: #{args.id}")
+    exit(1)
   end
 
   desc 'Set the load-multiplier of a BigBlueButton server'
@@ -166,6 +172,7 @@ namespace :servers do
     puts('OK')
   rescue ApplicationRedisRecord::RecordNotFound
     puts("ERROR: No server found with id: #{args.id}")
+    exit(1)
   end
 
   desc 'Adds multiple BigBlueButton servers defined in a YAML file passed as an argument'

spec/models/meeting_spec.rb

@@ -167,14 +167,8 @@
       context 'without tenant_id param' do
         let(:meetings) { described_class.all }
 
-        it 'fetches correct nb of Meetings' do
-          expect(meetings.size).to eq 2
-        end
-
-        it 'fetches Meetings with correct tenant_id' do
-          meetings.each do |meeting|
-            expect(meeting.tenant_id).to be_nil
-          end
+        it 'fetches all Meetings' do
+          expect(meetings.size).to eq 7
         end
       end
     end