From 545b33abf34ebbc74fe16e5e541e82d5a79e8457 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Mon, 24 Mar 2014 16:16:10 -0400 Subject: [PATCH] Allow disabling of output for rake config:check via a QUIET environment variable. --- apps/workbench/lib/tasks/config_check.rake | 13 ++++++++++--- services/api/lib/tasks/config_check.rake | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/apps/workbench/lib/tasks/config_check.rake b/apps/workbench/lib/tasks/config_check.rake index b74e03d907..ec1ae7bdc4 100644 --- a/apps/workbench/lib/tasks/config_check.rake +++ b/apps/workbench/lib/tasks/config_check.rake @@ -2,10 +2,17 @@ namespace :config do desc 'Ensure site configuration has all required settings' task check: :environment do $application_config.sort.each do |k, v| - if /(password|secret)/.match(k) then - $stderr.puts "%-32s %s" % [k, '*********'] + if ENV.has_key?('QUIET') then + # Make sure we still check for the variable to exist + eval("Rails.configuration.#{k}") else - $stderr.puts "%-32s %s" % [k, eval("Rails.configuration.#{k}")] + if /(password|secret)/.match(k) then + # Make sure we still check for the variable to exist, but don't print the value + eval("Rails.configuration.#{k}") + $stderr.puts "%-32s %s" % [k, '*********'] + else + $stderr.puts "%-32s %s" % [k, eval("Rails.configuration.#{k}")] + end end end end diff --git a/services/api/lib/tasks/config_check.rake b/services/api/lib/tasks/config_check.rake index b74e03d907..ec1ae7bdc4 100644 --- a/services/api/lib/tasks/config_check.rake +++ b/services/api/lib/tasks/config_check.rake @@ -2,10 +2,17 @@ namespace :config do desc 'Ensure site configuration has all required settings' task check: :environment do $application_config.sort.each do |k, v| - if /(password|secret)/.match(k) then - $stderr.puts "%-32s %s" % [k, '*********'] + if ENV.has_key?('QUIET') then + # Make sure we still check for the variable to exist + eval("Rails.configuration.#{k}") else - $stderr.puts "%-32s %s" % [k, eval("Rails.configuration.#{k}")] + if /(password|secret)/.match(k) then + # Make sure we still check for the variable to exist, but don't print the value + eval("Rails.configuration.#{k}") + $stderr.puts "%-32s %s" % [k, '*********'] + else + $stderr.puts "%-32s %s" % [k, eval("Rails.configuration.#{k}")] + end end end end -- 2.30.2