Skip to content

Commit 7abb17c

Browse files
djuiThomasObenaus
authored andcommitted
Use DefaultWriter and DefaultErrorWriter for debug messages (gin-gonic#1891)
Aligns behaviour according to documentation.
1 parent bdcf70d commit 7abb17c

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

debug.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"bytes"
99
"fmt"
1010
"html/template"
11-
"os"
1211
"runtime"
1312
"strconv"
1413
"strings"
@@ -54,7 +53,7 @@ func debugPrint(format string, values ...interface{}) {
5453
if !strings.HasSuffix(format, "\n") {
5554
format += "\n"
5655
}
57-
fmt.Fprintf(os.Stderr, "[GIN-debug] "+format, values...)
56+
fmt.Fprintf(DefaultWriter, "[GIN-debug] "+format, values...)
5857
}
5958
}
6059

@@ -98,6 +97,8 @@ at initialization. ie. before any route is registered or the router is listening
9897

9998
func debugPrintError(err error) {
10099
if err != nil {
101-
debugPrint("[ERROR] %v\n", err)
100+
if IsDebugging() {
101+
fmt.Fprintf(DefaultErrorWriter, "[GIN-debug] [ERROR] %v\n", err)
102+
}
102103
}
103104
}

debug_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@ func captureOutput(t *testing.T, f func()) string {
111111
if err != nil {
112112
panic(err)
113113
}
114-
stdout := os.Stdout
115-
stderr := os.Stderr
114+
defaultWriter := DefaultWriter
115+
defaultErrorWriter := DefaultErrorWriter
116116
defer func() {
117-
os.Stdout = stdout
118-
os.Stderr = stderr
117+
DefaultWriter = defaultWriter
118+
DefaultErrorWriter = defaultErrorWriter
119119
log.SetOutput(os.Stderr)
120120
}()
121-
os.Stdout = writer
122-
os.Stderr = writer
121+
DefaultWriter = writer
122+
DefaultErrorWriter = writer
123123
log.SetOutput(writer)
124124
out := make(chan string)
125125
wg := new(sync.WaitGroup)

0 commit comments

Comments
 (0)