From 2bd2e7c50dfa48c2dbf83bf56130a5cb14f026d3 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Tue, 20 Dec 2016 10:20:01 -0500 Subject: [PATCH] Merge pull request #13265 from skateman/websocket-log-level Add configuration support for websocket logging level (cherry picked from commit cb6fb25f4a6299c86cde77bb26ff7e30deb4df31) https://bugzilla.redhat.com/show_bug.cgi?id=1412285 --- config/settings.yml | 2 ++ lib/vmdb/loggers.rb | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/config/settings.yml b/config/settings.yml index ce1f6e37506..101626cbb7b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -991,6 +991,8 @@ :level_scvmm_in_evm: error :level_vim: warn :level_vim_in_evm: error + :level_websocket: info + :level_websocket_in_evm: error :management_system: :power_operation_expiration: 10.minutes :performance: diff --git a/lib/vmdb/loggers.rb b/lib/vmdb/loggers.rb index 200addd8421..82eb66a9eb7 100644 --- a/lib/vmdb/loggers.rb +++ b/lib/vmdb/loggers.rb @@ -23,17 +23,18 @@ def self.init end def self.apply_config(config) - apply_config_value(config, $log, :level) - apply_config_value(config, $rails_log, :level_rails) - apply_config_value(config, $vim_log, :level_vim, :level_vim_in_evm) - apply_config_value(config, $rhevm_log, :level_rhevm, :level_rhevm_in_evm) - apply_config_value(config, $aws_log, :level_aws, :level_aws_in_evm) - apply_config_value(config, $kube_log, :level_kube, :level_kube_in_evm) - apply_config_value(config, $mw_log, :level_mw, :level_mw_in_evm) - apply_config_value(config, $scvmm_log, :level_scvmm, :level_scvmm_in_evm) - apply_config_value(config, $api_log, :level_api, :level_api_in_evm) - apply_config_value(config, $fog_log, :level_fog, :level_fog_in_evm) - apply_config_value(config, $azure_log, :level_azure, :level_azure_in_evm) + apply_config_value(config, $log, :level) + apply_config_value(config, $rails_log, :level_rails) + apply_config_value(config, $vim_log, :level_vim, :level_vim_in_evm) + apply_config_value(config, $rhevm_log, :level_rhevm, :level_rhevm_in_evm) + apply_config_value(config, $aws_log, :level_aws, :level_aws_in_evm) + apply_config_value(config, $kube_log, :level_kube, :level_kube_in_evm) + apply_config_value(config, $mw_log, :level_mw, :level_mw_in_evm) + apply_config_value(config, $scvmm_log, :level_scvmm, :level_scvmm_in_evm) + apply_config_value(config, $api_log, :level_api, :level_api_in_evm) + apply_config_value(config, $fog_log, :level_fog, :level_fog_in_evm) + apply_config_value(config, $azure_log, :level_azure, :level_azure_in_evm) + apply_config_value(config, $websocket_log, :level_websocket, :level_websocket_in_evm) end private