refactor source

Author: vuduongtp

echo_adapter.go

@@ -294,7 +294,7 @@ func NewEchoLoggerMiddleware() echo.MiddlewareFunc {
 				"latency_ms": latency.Milliseconds(),
 				"referer":    req.Referer(),
 				"type":       LogTypeAPI,
-				"request_id": GetCorrelationID(ctx),
+				"request_id": getCorrelationID(ctx),
 				"error":      errStr,
 			}
 
@@ -326,7 +326,7 @@ func LogWithEchoContext(c echo.Context, content ...interface{}) {
 
 	logField := logrus.Fields{
 		"type":       logType,
-		"request_id": GetCorrelationID(c.Request().Context()),
+		"request_id": getCorrelationID(c.Request().Context()),
 	}
 
 	if len(content) > 2 {

main.go

@@ -21,10 +21,19 @@ const (
 
 // custom constants
 const (
-	DefaultTimestampFormat = "2006-01-02T15:04:05.00000Z07:00"
+	DefaultTimestampFormat = "2006-01-02 15:04:05.00000"
 	DefaultGormSourceField = "source"
 )
 
+// Key is key context type
+type Key string
+
+// Exported constanst
+const (
+	CorrelationIDKey Key = "X-User-Correlation-Id"
+	RequestIDKey     Key = "X-Request-ID"
+)
+
 // LogFormat log format
 type LogFormat uint32
 
@@ -86,6 +95,7 @@ type Logger struct {
 
 // SetFormatter logger formatter
 func (l *Logger) SetFormatter(logFormat LogFormat) {
+	l.logFormat = logFormat
 	switch logFormat {
 	case JSONFormat:
 		l.Logger.SetFormatter(&log.JSONFormatter{TimestampFormat: DefaultTimestampFormat})
@@ -142,7 +152,7 @@ func (l *Logger) SetLevel(level Level) {
 
 func getDefaultFileConfig() *FileConfig {
 	return &FileConfig{
-		Filename:       GetLogFile(),
+		Filename:       getLogFile(),
 		MaxSize:        10,
 		MaxBackups:     3,
 		MaxAge:         30,

util.go

@@ -9,31 +9,22 @@ import (
 	"time"
 )
 
-// Key is key context type
-type Key string
-
-// Exported constanst
-const (
-	CorrelationIDKey Key = "X-User-Correlation-Id"
-	RequestIDKey     Key = "X-Request-ID"
-)
-
 // withCorrelationID sets correlation id to context
 func withCorrelationID(parent context.Context, correlationID string) context.Context {
 	return context.WithValue(parent, CorrelationIDKey, correlationID)
 }
 
-// GetCorrelationID return correlation id
-func GetCorrelationID(ctx context.Context) string {
+// getCorrelationID return correlation id
+func getCorrelationID(ctx context.Context) string {
 	id := ctx.Value(CorrelationIDKey)
 	if id != nil {
 		return id.(string)
 	}
 	return ""
 }
 
-// GetLogFile get file log
-func GetLogFile() string {
+// getLogFile get file log
+func getLogFile() string {
 	path := ""
 	dir, err := os.Getwd()
 	if err != nil {