Merge pull request #13265 from skateman/websocket-log-level

Add configuration support for websocket logging level (cherry picked from commit cb6fb25) https://bugzilla.redhat.com/show_bug.cgi?id=1412285
ManageIQ · Jan 16, 2017 · 2bd2e7c · 2bd2e7c
1 parent 6f63c59
commit 2bd2e7c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git 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
@@ -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