Skip to content

Commit 8cfaf50

Browse files
nattawitcvishr
authored andcommitted
fix #1260 change middleware.Logger's default output (#1336)
* fix TestLoggerIPAddress reverse assertion * change middleware.Logger default output * remove nil field declaration
1 parent 405b221 commit 8cfaf50

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

middleware/logger.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"encoding/json"
66
"io"
7-
"os"
87
"strconv"
98
"strings"
109
"sync"
@@ -74,7 +73,6 @@ var (
7473
`"status":${status},"error":"${error}","latency":${latency},"latency_human":"${latency_human}"` +
7574
`,"bytes_in":${bytes_in},"bytes_out":${bytes_out}}` + "\n",
7675
CustomTimeFormat: "2006-01-02 15:04:05.00000",
77-
Output: os.Stdout,
7876
colorer: color.New(),
7977
}
8078
)
@@ -214,6 +212,10 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc {
214212
return
215213
}
216214

215+
if config.Output == nil {
216+
_, err = c.Logger().Output().Write(buf.Bytes())
217+
return
218+
}
217219
_, err = config.Output.Write(buf.Bytes())
218220
return
219221
}

middleware/logger_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ func TestLoggerIPAddress(t *testing.T) {
7070
// With X-Real-IP
7171
req.Header.Add(echo.HeaderXRealIP, ip)
7272
h(c)
73-
assert.Contains(t, ip, buf.String())
73+
assert.Contains(t, buf.String(), ip)
7474

7575
// With X-Forwarded-For
7676
buf.Reset()
7777
req.Header.Del(echo.HeaderXRealIP)
7878
req.Header.Add(echo.HeaderXForwardedFor, ip)
7979
h(c)
80-
assert.Contains(t, ip, buf.String())
80+
assert.Contains(t, buf.String(), ip)
8181

8282
buf.Reset()
8383
h(c)
84-
assert.Contains(t, ip, buf.String())
84+
assert.Contains(t, buf.String(), ip)
8585
}
8686

8787
func TestLoggerTemplate(t *testing.T) {

0 commit comments

Comments
 (0)