[arvados] created: 2.1.0-2620-gcb19768b2
git repository hosting
git at public.arvados.org
Mon Jun 27 13:38:32 UTC 2022
at cb19768b29658ec88b0df76e5b2e221934176057 (commit)
commit cb19768b29658ec88b0df76e5b2e221934176057
Author: Tom Clegg <tom at curii.com>
Date: Mon Jun 27 09:38:19 2022 -0400
19217: 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..fa1e1ca43 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 level temporarily raised to :error, see #{__FILE__})")
+ orig = ActiveRecord::Base.logger.level
+ ActiveRecord::Base.logger.level = :error
+ begin
+ yield
+ ensure
+ ActiveRecord::Base.logger.level = orig
+ end
+ end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list