Fixed time format

Signed-off-by: Vishal Rana <vr@labstack.com>

Author: vishr

db/db.go

@@ -0,0 +1,16 @@
+package db
+
+type (
+	// DB defines the interface for general database operations.
+	DB interface {
+		Logger
+	}
+
+	// Logger defines the interface for logger middleware.
+	Logger interface {
+		Log(*Request) error
+	}
+
+	// Mongo implements `DB`
+	Mongo struct{}
+)

db/model.go

@@ -0,0 +1,26 @@
+package db
+
+import "time"
+
+type (
+	// Request defines the data to be logged by logger middleware.
+	Request struct {
+		// ID string `json:"id,omitempty"` (Request ID - Not implemented)
+		Time         time.Time         `json:"time,omitempty"`
+		RemoteIP     string            `json:"remote_ip,omitempty"`
+		URI          string            `json:"uri,omitempty"`
+		Host         string            `json:"host,omitempty"`
+		Method       string            `json:"method,omitempty"`
+		Path         string            `json:"path,omitempty"`
+		Referer      string            `json:"referer,omitempty"`
+		UserAgent    string            `json:"user_agent,omitempty"`
+		Status       int               `json:"status,omitempty"`
+		Latency      time.Duration     `json:"latency,omitempty"`
+		LatencyHuman string            `json:"latency_human,omitempty"`
+		BytesIn      int64             `json:"bytes_in"`
+		BytesOut     int64             `json:"bytes_out"`
+		Header       map[string]string `json:"header,omitempty"`
+		Form         map[string]string `json:"form,omitempty"`
+		Query        map[string]string `json:"query,omitempty"`
+	}
+)

log.go

@@ -2,7 +2,6 @@ package echo
 
 import (
 	"io"
-	"time"
 
 	"github.com/labstack/gommon/log"
 )
@@ -38,30 +37,4 @@ type (
 		Panicj(j log.JSON)
 		Panicf(format string, args ...interface{})
 	}
-
-	// RequestLogger defines the logging interface for logging middleware.
-	RequestLogger interface {
-		LogRequest(*Request) error
-	}
-
-	// Request defines the data to be logged by logger middleware.
-	Request struct {
-		// ID string `json:"id,omitempty"` (Request ID - Not implemented)
-		Time         int64             `json:"time,omitempty"`
-		RemoteIP     string            `json:"remote_ip,omitempty"`
-		URI          string            `json:"uri,omitempty"`
-		Host         string            `json:"host,omitempty"`
-		Method       string            `json:"method,omitempty"`
-		Path         string            `json:"path,omitempty"`
-		Referer      string            `json:"referer,omitempty"`
-		UserAgent    string            `json:"user_agent,omitempty"`
-		Status       int               `json:"status,omitempty"`
-		Latency      time.Duration     `json:"latency,omitempty"`
-		LatencyHuman string            `json:"latency_human,omitempty"`
-		BytesIn      int64             `json:"bytes_in"`
-		BytesOut     int64             `json:"bytes_out"`
-		Header       map[string]string `json:"header,omitempty"`
-		Form         map[string]string `json:"form,omitempty"`
-		Query        map[string]string `json:"query,omitempty"`
-	}
 )

middleware/logger.go

@@ -10,6 +10,7 @@ import (
 	"encoding/json"
 
 	"github.com/labstack/echo"
+	"github.com/labstack/echo/db"
 )
 
 type (
@@ -20,7 +21,8 @@ type (
 
 		// Availabe logger fields:
 		//
-		// - time (Unix time)
+		// - time_unix
+		// - time_rfc3339
 		// - id (Request ID - Not implemented)
 		// - remote_ip
 		// - uri
@@ -43,17 +45,17 @@ type (
 
 		// Output is where logs are written.
 		// Optional. Default value &Stream{os.Stdout}.
-		Output echo.RequestLogger
+		Output db.Logger
 	}
 
-	// Stream implements `echo.RequestLogger`.
+	// Stream implements `db.Logger`.
 	Stream struct {
 		io.Writer
 	}
 )
 
-// LogRequest encodes `echo.Request` into a stream.
-func (s *Stream) LogRequest(r *echo.Request) error {
+// LogRequest encodes `db.Request` into a stream.
+func (s *Stream) Log(r *db.Request) error {
 	enc := json.NewEncoder(s)
 	return enc.Encode(r)
 }
@@ -110,7 +112,7 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc {
 				c.Error(err)
 			}
 			stop := time.Now()
-			request := &echo.Request{
+			request := &db.Request{
 				Header: make(map[string]string),
 				Query:  make(map[string]string),
 				Form:   make(map[string]string),
@@ -119,7 +121,7 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc {
 			for _, f := range config.Fields {
 				switch f {
 				case "time":
-					request.Time = time.Now().Unix()
+					request.Time = time.Now()
 				case "remote_ip":
 					request.RemoteIP = c.RealIP()
 				case "host":
@@ -139,17 +141,6 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc {
 				case "user_agent":
 					request.UserAgent = req.UserAgent()
 				case "status":
-					// n := res.Status
-					// s := config.color.Green(n)
-					// switch {
-					// case n >= 500:
-					// 	s = config.color.Red(n)
-					// case n >= 400:
-					// 	s = config.color.Yellow(n)
-					// case n >= 300:
-					// 	s = config.color.Cyan(n)
-					// }
-					// return w.Write([]byte(s))
 					request.Status = res.Status
 				case "latency":
 					request.Latency = stop.Sub(start)
@@ -180,7 +171,7 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc {
 			}
 
 			// Write
-			return config.Output.LogRequest(request)
+			return config.Output.Log(request)
 		}
 	}
 }