Skip to content

Commit

Permalink
Use DefaultWriter and DefaultErrorWriter for debug messages (gin-goni…
Browse files Browse the repository at this point in the history
…c#1891)

Aligns behaviour according to documentation.
  • Loading branch information
djui authored and ThomasObenaus committed Feb 19, 2020
1 parent bdcf70d commit 7abb17c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
7 changes: 4 additions & 3 deletions debug.go
Expand Up @@ -8,7 +8,6 @@ import (
"bytes"
"fmt"
"html/template"
"os"
"runtime"
"strconv"
"strings"
Expand Down Expand Up @@ -54,7 +53,7 @@ func debugPrint(format string, values ...interface{}) {
if !strings.HasSuffix(format, "\n") {
format += "\n"
}
fmt.Fprintf(os.Stderr, "[GIN-debug] "+format, values...)
fmt.Fprintf(DefaultWriter, "[GIN-debug] "+format, values...)
}
}

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

func debugPrintError(err error) {
if err != nil {
debugPrint("[ERROR] %v\n", err)
if IsDebugging() {
fmt.Fprintf(DefaultErrorWriter, "[GIN-debug] [ERROR] %v\n", err)
}
}
}
12 changes: 6 additions & 6 deletions debug_test.go
Expand Up @@ -111,15 +111,15 @@ func captureOutput(t *testing.T, f func()) string {
if err != nil {
panic(err)
}
stdout := os.Stdout
stderr := os.Stderr
defaultWriter := DefaultWriter
defaultErrorWriter := DefaultErrorWriter
defer func() {
os.Stdout = stdout
os.Stderr = stderr
DefaultWriter = defaultWriter
DefaultErrorWriter = defaultErrorWriter
log.SetOutput(os.Stderr)
}()
os.Stdout = writer
os.Stderr = writer
DefaultWriter = writer
DefaultErrorWriter = writer
log.SetOutput(writer)
out := make(chan string)
wg := new(sync.WaitGroup)
Expand Down

0 comments on commit 7abb17c

Please sign in to comment.