From bae9c5f2ab7c9abd101718479285da52740eec02 Mon Sep 17 00:00:00 2001
From: Kyrylo Galanov <kgalanov@mirantis.com>
Date: Tue, 17 Nov 2015 16:34:59 +0200
Subject: [PATCH] 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
---
 bin/astuted   |  4 ++--
 lib/astute.rb | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/astuted b/bin/astuted
index e6cad0bb..0b659cbe 100755
--- a/bin/astuted
+++ b/bin/astuted
@@ -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}"
diff --git a/lib/astute.rb b/lib/astute.rb
index a30079fb..3cb2fe68 100644
--- a/lib/astute.rb
+++ b/lib/astute.rb
@@ -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