Skip to content

Commit

Permalink
Introduce $vcloud_log (backporting to fine branch)
Browse files Browse the repository at this point in the history
There is a [PR](ManageIQ#16641)
already merged in master that introduces $vcloud_log, but since
logging has changed in this [PR](ManageIQ#15397),
there are merge conflicts for fine branch. Hence this commit.

Signed-off-by: Miha Pleško <[email protected]>
  • Loading branch information
miha-plesko committed Jan 5, 2018
1 parent 0f76ef7 commit 9efee53
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions .rubocop_local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ GlobalVars:
- $scvmm_log
- $vim_log
- $websocket_log
- $vcloud_log
# In Automate methods
- $evm
#
Expand Down
2 changes: 2 additions & 0 deletions config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,8 @@
:level_vim_in_evm: error
:level_websocket: info
:level_websocket_in_evm: error
:level_vcloud: info
:level_vcloud_in_evm: error
:management_system:
:power_operation_expiration: 10.minutes
:performance:
Expand Down
2 changes: 2 additions & 0 deletions lib/vmdb/loggers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def self.apply_config(config)
apply_config_value(config, $azure_log, :level_azure, :level_azure_in_evm)
apply_config_value(config, $lenovo_log, :level_lenovo, :level_lenovo_in_evm)
apply_config_value(config, $websocket_log, :level_websocket, :level_websocket_in_evm)
apply_config_value(config, $vcloud_log, :level_vcloud, :level_vcloud_in_evm)
end

private
Expand Down Expand Up @@ -69,6 +70,7 @@ def self.create_loggers
$websocket_log = MirroredLogger.new(path_dir.join("websocket.log"), "<WEBSOCKET> ")
$miq_ae_logger = MirroredLogger.new(path_dir.join("automation.log"), "<AutomationEngine> ")
$miq_ae_logger.mirror_level = VMDBLogger::INFO
$vcloud_log = MirroredLogger.new(path_dir.join("vcloud.log"), "<VCLOUD> ")
end

configure_external_loggers
Expand Down

0 comments on commit 9efee53

Please sign in to comment.