From 16f26b7f9f6619172ceed4703bd557e615290532 Mon Sep 17 00:00:00 2001 From: azavodovskyy Date: Tue, 13 Oct 2020 10:47:47 +0300 Subject: [PATCH] Remove error word from info logs *40140 --- logger.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/logger.go b/logger.go index a42f2727..0e96902d 100644 --- a/logger.go +++ b/logger.go @@ -10,6 +10,8 @@ import ( "strconv" "time" "unicode" + + mysql2 "github.com/go-sql-driver/mysql" ) var ( @@ -100,7 +102,21 @@ var LogFormatter = func(values ...interface{}) (messages []interface{}) { messages = append(messages, fmt.Sprintf(" \n\033[36;31m[%v]\033[0m ", strconv.FormatInt(values[5].(int64), 10)+" rows affected or returned ")) } else { messages = append(messages, "\033[31;1m") - messages = append(messages, values[2:]...) + + var message interface{} + value := values[2] + switch v := value.(type) { + case mysql2.MySQLError: + message = fmt.Sprintf("%d: %s", v.Number, v.Message) + default: + message = value + } + messages = append(messages, message) + + if len(values) > 3 { + messages = append(messages, values[3:]...) + } + messages = append(messages, "\033[0m") } }