openstack
/
fuel-astute
Code Issues Proposed changes

Set logging level same as other fuel services 

Astute was the only fuel service using short ERR and CRIT log levels,
it led to unconvinient log viewing using the WebUI.

Change-Id: I3dd8e7d80030f6a16d910ee28950102b31765af5
Closes-bug: #1286110
This commit is contained in:
Kyrylo Galanov 2015-11-17 16:34:59 +02:00
parent c8400f51b0
commit bae9c5f2ab
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/astuted
View File

@ -75,8 +75,8 @@ Astute.config.update(YAML.load(File.read(options.config_path))) if File.exists?(
Astute.logger = options.log_path ? Logger.new(options.log_path) : Logger.new(STDOUT)
Astute.logger.level = Logger.const_get(options.log_level.upcase)
Astute.logger.formatter = proc do |severity, datetime, progname, msg|
severity_map = {'DEBUG' => 'debug', 'INFO' => 'info', 'WARN' => 'warning', 'ERROR' => 'err', 'FATAL' => 'crit'}
"#{datetime.strftime("%Y-%m-%dT%H:%M:%S")} #{severity_map[severity]}: [#{Process.pid}] #{msg}\n"
severity_map = {'DEBUG' => 'DEBUG', 'INFO' => 'INFO', 'WARN' => 'WARNING', 'ERROR' => 'ERROR', 'FATAL' => 'CRITICAL'}
"#{datetime.strftime("%Y-%m-%d %H:%M:%S")} #{severity_map[severity]} [#{Process.pid}] #{msg}\n"
end
Astute.logger.info "Starting with settings\n#{Astute.config.to_yaml}"

12
lib/astute.rb
View File

@ -87,14 +87,14 @@ module Astute
@logger = Logger.new(LOG_PATH)
@logger.formatter = proc do |severity, datetime, progname, msg|
severity_map = {
'DEBUG' => 'debug',
'INFO' => 'info',
'WARN' => 'warning',
'ERROR' => 'err',
'FATAL' => 'crit'
'DEBUG' => 'DEBUG',
'INFO' => 'INFO',
'WARN' => 'WARNING',
'ERROR' => 'ERROR',
'FATAL' => 'CRITICAL'
}
"#{datetime.strftime("%Y-%m-%dT%H:%M:%S")} #{severity_map[severity]}: [#{Process.pid}] #{msg}\n"
"#{datetime.strftime("%Y-%m-%d %H:%M:%S")} #{severity_map[severity]} [#{Process.pid}] #{msg}\n"
end
end
@logger