From ef2a9f6fd1610e2d82e841dce62d7e7411ed8d23 Mon Sep 17 00:00:00 2001
From: John <john@johng.cn>
Date: Thu, 27 Feb 2020 17:09:12 +0800
Subject: [PATCH] fix issue in log paatern for ghttp.Server

---
 .example/net/ghttp/server/middleware/log.go | 6 ++----
 net/ghttp/ghttp_server_log.go               | 7 ++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.example/net/ghttp/server/middleware/log.go b/.example/net/ghttp/server/middleware/log.go
index c0cc2fc2c..225dc4c8c 100644
--- a/.example/net/ghttp/server/middleware/log.go
+++ b/.example/net/ghttp/server/middleware/log.go
@@ -25,14 +25,12 @@ func MiddlewareCORS(r *ghttp.Request) {
 
 func MiddlewareLog(r *ghttp.Request) {
 	r.Middleware.Next()
-	glog.Println(r.Response.Status, r.URL.Path)
+	g.Log().Println(r.Response.Status, r.URL.Path)
 }
 
 func main() {
 	s := g.Server()
-	s.Group("/", func(group *ghttp.RouterGroup) {
-		group.Middleware(MiddlewareLog)
-	})
+	s.Use(MiddlewareLog)
 	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
 		group.Middleware(MiddlewareAuth, MiddlewareCORS)
 		group.ALL("/user/list", func(r *ghttp.Request) {
diff --git a/net/ghttp/ghttp_server_log.go b/net/ghttp/ghttp_server_log.go
index 1310d69f4..7d743ab8e 100644
--- a/net/ghttp/ghttp_server_log.go
+++ b/net/ghttp/ghttp_server_log.go
@@ -53,20 +53,21 @@ func (s *Server) handleErrorLog(err error, r *Request) {
 	if r.TLS != nil {
 		scheme = "https"
 	}
-	content := fmt.Sprintf(`%d, "%s %s %s %s %s" %.3f, %s, "%s", "%s"`,
+	content := fmt.Sprintf(
+		`%d, "%s %s %s %s %s" %.3f, %s, "%s", "%s"`,
 		r.Response.Status, r.Method, scheme, r.Host, r.URL.String(), r.Proto,
 		float64(r.LeaveTime-r.EnterTime)/1000,
 		r.GetClientIp(), r.Referer(), r.UserAgent(),
 	)
 	if stack := gerror.Stack(err); stack != "" {
 		content += "\nStack:\n" + stack
-		s.config.Logger.File(s.config.AccessLogPattern).
+		s.config.Logger.File(s.config.ErrorLogPattern).
 			Stack(false).
 			Stdout(s.config.LogStdout).
 			Error(content)
 		return
 	}
-	s.Logger().File(s.config.AccessLogPattern).
+	s.Logger().File(s.config.ErrorLogPattern).
 		Stack(s.config.ErrorStack).
 		StackWithFilter(gPATH_FILTER_KEY).
 		Stdout(s.config.LogStdout).