From 444305205786d2aa774aaddd363584d10c2958b0 Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Thu, 11 Aug 2016 10:45:06 +0200 Subject: [PATCH] Fixed per component setting of logging --- .../logging_command.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/hammer_cli_foreman_admin/logging_command.rb b/lib/hammer_cli_foreman_admin/logging_command.rb index f7f322c..6e9ae4e 100644 --- a/lib/hammer_cli_foreman_admin/logging_command.rb +++ b/lib/hammer_cli_foreman_admin/logging_command.rb @@ -78,6 +78,11 @@ def configure_component(component, level) file = option_prefix + file if option_prefix backup_suffix = Time.now.utc.to_i.to_s(36) if File.exists?(file) + unless option_no_backup? || option_dry_run? + backup_file = "#{file}.#{backup_suffix}~" + logger.info "Creating backup #{backup_file}" + FileUtils.cp(file, backup_file) + end component[level].each do |action| action_name = action[:action] action[:name] = name @@ -87,16 +92,9 @@ def configure_component(component, level) action[:file] = file end func = action_functions[action_name.to_sym] - if func + if func && ! option_dry_run? logger.info "Processing #{name} action #{action_name}" - unless option_dry_run? - unless option_no_backup? - backup_file = "#{file}.#{backup_suffix}~" - logger.info "Creating backup #{backup_file}" - FileUtils.cp(file, backup_file) - end - func.call(action) - end + func.call(action) else raise "Unknown action #{action_name} for component #{name}" end @@ -126,7 +124,7 @@ def execute if option_all? components = configuration else - raise("Unknown component provided, use --list to find them") unless option_components.all? { |c| available_components.include? c } + raise("Unknown component provided, use --list to find them") unless option_components.all? { |c| available_components.map{|x| x[:name]}.include? c } components = configuration.select{ |x| option_components.include? x[:name] } end components.each { |component| configure_component(component, new_level) }