Project

General

Profile

« Previous | Next » 

Revision b0b46844

Added by Lukas Zapletal almost 6 years ago

Fixes #24185 - logging env override config fixed (#5792)

View differences:

lib/foreman/logging.rb
def load_config(environment, overrides = {})
fail "Logging configuration 'config/logging.yaml' not present" unless File.exist?('config/logging.yaml')
overrides ||= {}
overrides = overrides[environment.to_sym] if overrides.has_key?(environment.to_sym)
overrides.deep_merge!(overrides[environment.to_sym]) if overrides.has_key?(environment.to_sym)
@config = YAML.load_file('config/logging.yaml')
@config = @config[:default].deep_merge(@config[environment.to_sym]).deep_merge(overrides)
end

Also available in: Unified diff