[arvados] created: 2.1.0-2620-gf8a980a42

[git repository hosting]

        at  f8a980a42d27defdac9f45b33751bd4209a6ee75 (commit)


commit f8a980a42d27defdac9f45b33751bd4209a6ee75
Author: Tom Clegg <tom at curii.com>
Date:   Sat Jun 25 20:57:04 2022 -0400

    Silence SQL logs during database reset.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/api/app/controllers/database_controller.rb b/services/api/app/controllers/database_controller.rb
index 5c4cf7bc1..2efe38e65 100644
--- a/services/api/app/controllers/database_controller.rb
+++ b/services/api/app/controllers/database_controller.rb
@@ -6,6 +6,8 @@ class DatabaseController < ApplicationController
   skip_before_action :find_object_by_uuid
   skip_before_action :render_404_if_no_object
   before_action :admin_required
+  around_action :silence_logs, only: [:reset]
+
   def reset
     raise ArvadosModel::PermissionDeniedError unless Rails.env == 'test'
 
@@ -83,4 +85,17 @@ class DatabaseController < ApplicationController
     # Done.
     send_json success: true
   end
+
+  protected
+
+  def silence_logs
+    Rails.logger.info("(logging suppressed, see #{__FILE__})")
+    orig = ActiveRecord::Base.logger
+    ActiveRecord::Base.logger = Logger.new('/dev/null')
+    begin
+      yield
+    ensure
+      ActiveRecord::Base.logger = orig
+    end
+  end
 end

-----------------------------------------------------------------------


hooks/post-receive
--