Skip to content

Commit 55bda1e

Browse files
authored
Partly revert "Replace rake task puts with logger commands" (#1227)
1 parent e1a3380 commit 55bda1e

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

lib/tasks/servers.rake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ namespace :servers do
4040
unless args.load_multiplier.nil?
4141
tmp_load_multiplier = args.load_multiplier.to_d
4242
if tmp_load_multiplier.zero?
43+
puts('WARNING! Load-multiplier was not readable or 0, so it is now 1')
4344
Rails.logger.info('WARNING! Load-multiplier was not readable or 0, so it is now 1')
4445
tmp_load_multiplier = 1.0
4546
end
@@ -51,13 +52,15 @@ namespace :servers do
5152

5253
desc 'Update a BigBlueButton server'
5354
task :update, [:id, :secret, :load_multiplier, :tag] => :environment do |_t, args|
55+
puts("Updating server #{args.id}...")
5456
Rails.logger.info("Updating server #{args.id}...")
5557
server = Server.find(args.id)
5658
server.secret = args.secret unless args.secret.nil?
5759
tmp_load_multiplier = server.load_multiplier
5860
unless args.load_multiplier.nil?
5961
tmp_load_multiplier = args.load_multiplier.to_d
6062
if tmp_load_multiplier.zero?
63+
puts('WARNING! Load-multiplier was not readable or 0, so it is now 1')
6164
Rails.logger.info('WARNING! Load-multiplier was not readable or 0, so it is now 1')
6265
tmp_load_multiplier = 1.0
6366
end
@@ -73,6 +76,7 @@ namespace :servers do
7376

7477
desc 'Remove a BigBlueButton server'
7578
task :remove, [:id] => :environment do |_t, args|
79+
puts("Removing server #{args.id}...")
7680
Rails.logger.info("Removing server #{args.id}...")
7781
server = Server.find(args.id)
7882
server.destroy!
@@ -84,6 +88,7 @@ namespace :servers do
8488

8589
desc 'Mark a BigBlueButton server as available for scheduling new meetings'
8690
task :enable, [:id] => :environment do |_t, args|
91+
puts("Enabling server #{args.id}...")
8792
Rails.logger.info("Enabling server #{args.id}...")
8893
server = Server.find(args.id)
8994
server.state = 'enabled'
@@ -97,6 +102,7 @@ namespace :servers do
97102
desc 'Mark a BigBlueButton server as cordoned to stop scheduling new meetings but consider for
98103
load calculation and joining existing meetings'
99104
task :cordon, [:id] => :environment do |_t, args|
105+
puts("Cordoning server #{args.id}...")
100106
Rails.logger.info("Cordoning server #{args.id}...")
101107
server = Server.find(args.id)
102108
server.state = 'cordoned'
@@ -113,6 +119,7 @@ namespace :servers do
113119
desc 'Mark a BigBlueButton server as unavailable to stop scheduling new meetings'
114120
task :disable, [:id] => :environment do |_t, args|
115121
include ApiHelper
122+
puts("Disabling server #{args.id}...")
116123
Rails.logger.info("Disabling server #{args.id}...")
117124
server = Server.find(args.id)
118125
response = true
@@ -124,6 +131,7 @@ namespace :servers do
124131
if response
125132
meetings = Meeting.all.select { |m| m.server_id == server.id }
126133
meetings.each do |meeting|
134+
puts("Clearing Meeting id=#{meeting.id}")
127135
Rails.logger.info("Clearing Meeting id=#{meeting.id}")
128136
moderator_pw = meeting.try(:moderator_pw)
129137
meeting.destroy!
@@ -145,6 +153,7 @@ namespace :servers do
145153

146154
desc 'Mark a BigBlueButton server as unavailable, and clear all meetings from it'
147155
task :panic, [:id, :keep_state, :skip_end_calls] => :environment do |_t, args|
156+
puts("Panicking server #{args.id}...")
148157
Rails.logger.info("Panicking server #{args.id}...")
149158
args.with_defaults(keep_state: false, skip_end_calls: false)
150159
include ApiHelper
@@ -153,6 +162,7 @@ namespace :servers do
153162

154163
meetings = Meeting.all.select { |m| m.server_id == server.id }
155164
meetings.each do |meeting|
165+
puts("Clearing Meeting id=#{meeting.id}")
156166
Rails.logger.info("Clearing Meeting id=#{meeting.id}")
157167
moderator_pw = meeting.try(:moderator_pw)
158168
meeting.destroy!
@@ -180,6 +190,7 @@ namespace :servers do
180190
unless args.load_multiplier.nil?
181191
tmp_load_multiplier = args.load_multiplier.to_d
182192
if tmp_load_multiplier.zero?
193+
puts('WARNING! Load-multiplier was not readable or 0, so it is now 1')
183194
Rails.logger.info('WARNING! Load-multiplier was not readable or 0, so it is now 1')
184195
tmp_load_multiplier = 1.0
185196
end

lib/tasks/tenant_settings.rake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ task tenantSettings: :environment do
1313
tenants.each do |tenant|
1414
settings = TenantSetting.all(tenant.id)
1515

16-
Rails.logger.info("Tenant: #{tenant.name}")
16+
puts("Tenant: #{tenant.name}")
1717
if settings.present?
1818
settings.each do |setting|
19-
Rails.logger.info(" id: #{setting.id}")
20-
Rails.logger.info("\tparam: #{setting.param}")
21-
Rails.logger.info("\tvalue: #{setting.value}")
22-
Rails.logger.info("\toverride: #{setting.override}")
19+
puts(" id: #{setting.id}")
20+
puts("\tparam: #{setting.param}")
21+
puts("\tvalue: #{setting.value}")
22+
puts("\toverride: #{setting.override}")
2323
end
2424
else
2525
warn(' No custom settings are configured')

0 commit comments

Comments
 (0)