Added dropdown for dynamically changing the log level (#962)

This commit is contained in:
Ahmad Farhat 2020-02-24 12:51:27 -05:00 committed by GitHub
parent 2cc1fdf281
commit 4093a89b4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 79 additions and 0 deletions

View File

@ -234,6 +234,13 @@ class AdminsController < ApplicationController
redirect_to admin_site_settings_path, flash: { success: I18n.t("administrator.flash.settings") } redirect_to admin_site_settings_path, flash: { success: I18n.t("administrator.flash.settings") }
end 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 # ROLES
# GET /admins/roles # GET /admins/roles

View File

@ -64,6 +64,23 @@ module AdminsHelper
end end
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 def room_limit_number
@settings.get_value("Room Limit").to_i @settings.get_value("Room Limit").to_i
end end

View File

@ -195,4 +195,37 @@
</div> </div>
</div> </div>
</div> </div>
<div class="mb-4 row">
<div class="col-12">
<div class="form-group">
<label class="form-label"><%= t("administrator.site_settings.log_level.title") %></label>
<label class="form-label text-muted"><%= t("administrator.site_settings.log_level.information") %></label>
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" type="button" id="room-auth" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<%= log_level_string %>
</button>
<div class="dropdown-menu" aria-labelledby="room-auth">
<%= button_to admin_log_level_path(value: 0), class: "dropdown-item", "data-disable": "" do %>
<%= t("administrator.site_settings.log_level.debug") %>
<% end %>
<%= button_to admin_log_level_path(value: 1), class: "dropdown-item", "data-disable": "" do %>
<%= t("administrator.site_settings.log_level.info") %>
<% end %>
<%= button_to admin_log_level_path(value: 2), class: "dropdown-item", "data-disable": "" do %>
<%= t("administrator.site_settings.log_level.warn") %>
<% end %>
<%= button_to admin_log_level_path(value: 3), class: "dropdown-item", "data-disable": "" do %>
<%= t("administrator.site_settings.log_level.error") %>
<% end %>
<%= button_to admin_log_level_path(value: 4), class: "dropdown-item", "data-disable": "" do %>
<%= t("administrator.site_settings.log_level.fatal") %>
<% end %>
<%= button_to admin_log_level_path(value: 5), class: "dropdown-item", "data-disable": "" do %>
<%= t("administrator.site_settings.log_level.unknown") %>
<% end %>
</div>
</div>
</div>
</div>
</div>
<% end %> <% end %>

View File

@ -56,6 +56,15 @@ en:
regular: Regular regular: Regular
lighten: Lighten lighten: Lighten
darken: Darken 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: recording_visibility:
info: Set the default recording visbility for new recordings info: Set the default recording visbility for new recordings
title: Recording Default Visibility title: Recording Default Visibility

View File

@ -57,6 +57,7 @@ Rails.application.routes.draw do
post '/coloring', to: 'admins#coloring', as: :admin_coloring post '/coloring', to: 'admins#coloring', as: :admin_coloring
post '/clear_cache', to: 'admins#clear_cache', as: :admin_clear_cache post '/clear_cache', to: 'admins#clear_cache', as: :admin_clear_cache
post '/clear_auth', to: 'admins#clear_auth', as: :admin_clear_auth post '/clear_auth', to: 'admins#clear_auth', as: :admin_clear_auth
post '/log_level', to: 'admins#log_level', as: :admin_log_level
# Roles # Roles
post '/role', to: 'admins#new_role', as: :admin_new_role post '/role', to: 'admins#new_role', as: :admin_new_role
patch 'roles/order', to: 'admins#change_role_order', as: :admin_roles_order patch 'roles/order', to: 'admins#change_role_order', as: :admin_roles_order

View File

@ -434,6 +434,18 @@ describe AdminsController, type: :controller do
expect(@user3.social_uid).to be(nil) expect(@user3.social_uid).to be(nil)
end end
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 end
describe "Roles" do describe "Roles" do