diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb index f84c5eb3..6df19169 100644 --- a/app/controllers/admins_controller.rb +++ b/app/controllers/admins_controller.rb @@ -234,6 +234,13 @@ class AdminsController < ApplicationController redirect_to admin_site_settings_path, flash: { success: I18n.t("administrator.flash.settings") } end + # POST /admins/log_level + def log_level + Rails.logger.level = params[:value].to_i + + redirect_to admin_site_settings_path, flash: { success: I18n.t("administrator.flash.settings") } + end + # ROLES # GET /admins/roles diff --git a/app/helpers/admins_helper.rb b/app/helpers/admins_helper.rb index f640dfbb..955d188e 100644 --- a/app/helpers/admins_helper.rb +++ b/app/helpers/admins_helper.rb @@ -64,6 +64,23 @@ module AdminsHelper end end + def log_level_string + case Rails.logger.level + when 0 + t("administrator.site_settings.log_level.debug") + when 1 + t("administrator.site_settings.log_level.info") + when 2 + t("administrator.site_settings.log_level.warn") + when 3 + t("administrator.site_settings.log_level.error") + when 4 + t("administrator.site_settings.log_level.fatal") + when 5 + t("administrator.site_settings.log_level.unknown") + end + end + def room_limit_number @settings.get_value("Room Limit").to_i end diff --git a/app/views/admins/components/_settings.html.erb b/app/views/admins/components/_settings.html.erb index 7e3d5371..4dcb0f73 100644 --- a/app/views/admins/components/_settings.html.erb +++ b/app/views/admins/components/_settings.html.erb @@ -195,4 +195,37 @@ +
+
+
+ + + +
+
+
<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 098e6d35..6b01adc4 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -56,6 +56,15 @@ en: regular: Regular lighten: Lighten darken: Darken + log_level: + title: Log Level + information: Change the Log Level for the entire deployment + debug: Debug + info: Info + warn: Warn + error: Error + fatal: Fatal + unknown: Unknown recording_visibility: info: Set the default recording visbility for new recordings title: Recording Default Visibility diff --git a/config/routes.rb b/config/routes.rb index 0fed8a88..c5af3050 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -57,6 +57,7 @@ Rails.application.routes.draw do post '/coloring', to: 'admins#coloring', as: :admin_coloring post '/clear_cache', to: 'admins#clear_cache', as: :admin_clear_cache post '/clear_auth', to: 'admins#clear_auth', as: :admin_clear_auth + post '/log_level', to: 'admins#log_level', as: :admin_log_level # Roles post '/role', to: 'admins#new_role', as: :admin_new_role patch 'roles/order', to: 'admins#change_role_order', as: :admin_roles_order diff --git a/spec/controllers/admins_controller_spec.rb b/spec/controllers/admins_controller_spec.rb index b86e0596..36620710 100644 --- a/spec/controllers/admins_controller_spec.rb +++ b/spec/controllers/admins_controller_spec.rb @@ -434,6 +434,18 @@ describe AdminsController, type: :controller do expect(@user3.social_uid).to be(nil) end end + + context "POST #log_level" do + it "changes the log level" do + @request.session[:user_id] = @admin.id + + @admin.add_role :super_admin + + expect(Rails.logger.level).to eq(0) + post :log_level, params: { value: 2 } + expect(Rails.logger.level).to eq(2) + end + end end describe "Roles" do