Marion преди 5 години
родител
ревизия
d4a9343026
променени са 1 файла, в които са добавени 10 реда и са изтрити 8 реда
  1. 10 8
      utils/logger/logger.go

+ 10 - 8
utils/logger/logger.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
-	"gopkg.in/gemnasium/logrus-graylog-hook.v2"
 	"os"
 	"reflect"
 	"regexp"
@@ -48,10 +47,10 @@ func New() *Logger {
 		Hooks:     make(logrus.LevelHooks),
 		Level:     level,
 	}
-	if grayAddr, ok := viper.Get("logger.graylog.addr").(string); ok && len(grayAddr) > 0 {
-		grayHook := graylog.NewGraylogHook(grayAddr, nil)
-		log.AddHook(grayHook)
-	}
+	//if grayAddr, ok := viper.Get("logger.graylog.addr").(string); ok && len(grayAddr) > 0 {
+	//	grayHook := graylog.NewGraylogHook(grayAddr, nil)
+	//	log.AddHook(grayHook)
+	//}
 	entry := logrus.NewEntry(log)
 	extra := viper.GetStringMap("logger.extra")
 	if nil != extra && len(extra) > 0 {
@@ -81,7 +80,7 @@ func (logger *Logger) WithField(key string, value interface{}) *Logger {
 }
 
 func (logger *Logger) WithFields(fields map[string]interface{}) *Logger {
- 	return &Logger{Entry: *logger.Entry.WithFields(fields)}
+	return &Logger{Entry: *logger.Entry.WithFields(fields)}
 }
 
 func (logger *Logger) WithError(err error) *Logger {
@@ -105,7 +104,7 @@ func (logger *Logger) WithCaller(skip int) *Logger {
 	if _, file, line, ok := runtime.Caller(skip); ok {
 		return logger.
 			WithField("codeline", fmt.Sprintf("%s:%d", file, line))
-			//WithField("func", runtime.FuncForPC(pc).Name())
+		//WithField("func", runtime.FuncForPC(pc).Name())
 	}
 	return logger
 }
@@ -278,6 +277,9 @@ func (logger *Logger) getSql(originSql string, params []interface{}) string {
 			formattedValues = append(formattedValues, "NULL")
 		}
 	}
+	if nil == formattedValues {
+		return ""
+	}
 
 	var sql string
 	// differentiate between $n placeholders or else treat like ?
@@ -305,4 +307,4 @@ func (logger *Logger) isPrintable(s string) bool {
 		}
 	}
 	return true
-}
+}