rename proto to protocol

danmeiyihen · Jul 11, 2018 · 09dcba1 · 09dcba1
1 parent 2a54603
commit 09dcba1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/middleware/logger.go b/middleware/logger.go
@@ -33,7 +33,7 @@ type (
 		// - host
 		// - method
 		// - path
-		// - proto
+		// - protocol
 		// - referer
 		// - user_agent
 		// - status
@@ -155,7 +155,7 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc {
 						p = "/"
 					}
 					return buf.WriteString(p)
-				case "proto":
+				case "protocol":
 					return buf.WriteString(req.Proto)
 				case "referer":
 					return buf.WriteString(req.Referer())

diff --git a/middleware/logger_test.go b/middleware/logger_test.go
@@ -92,7 +92,7 @@ func TestLoggerTemplate(t *testing.T) {
 		Format: `{"time":"${time_rfc3339_nano}","id":"${id}","remote_ip":"${remote_ip}","host":"${host}","user_agent":"${user_agent}",` +
 			`"method":"${method}","uri":"${uri}","status":${status}, "latency":${latency},` +
 			`"latency_human":"${latency_human}","bytes_in":${bytes_in}, "path":"${path}", "referer":"${referer}",` +
-			`"bytes_out":${bytes_out},"ch":"${header:X-Custom-Header}", "proto":"${proto}"` +
+			`"bytes_out":${bytes_out},"ch":"${header:X-Custom-Header}", "protocol":"${protocol}"` +
 			`"us":"${query:username}", "cf":"${form:username}", "session":"${cookie:session}"}` + "\n",
 		Output: buf,
 	}))