Skip to content

Commit a59d9ba

Browse files
authored
🚀 Consistent way of logging and fix middleware log format (gofiber#2432)
* 🚀 Replace fmt.Print* with log.Print* (gofiber#2402) * 🚀 Fix middleware logging format (gofiber#2402)
1 parent 9d8eba5 commit a59d9ba

File tree

8 files changed

+17
-16
lines changed

8 files changed

+17
-16
lines changed

internal/template/html/html.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"html/template"
66
"io"
7+
"log"
78
"net/http"
89
"os"
910
"path/filepath"
@@ -112,7 +113,7 @@ func (e *Engine) Debug(enabled bool) *Engine {
112113

113114
// Parse is deprecated, please use Load() instead
114115
func (e *Engine) Parse() error {
115-
fmt.Println("Parse() is deprecated, please use Load() instead.")
116+
log.Println("[Warning] Parse() is deprecated, please use Load() instead.")
116117
return e.Load()
117118
}
118119

@@ -169,7 +170,7 @@ func (e *Engine) Load() error {
169170
}
170171
// Debugging
171172
if e.debug {
172-
fmt.Printf("views: parsed template: %s\n", name)
173+
log.Printf("views: parsed template: %s\n", name)
173174
}
174175
return err
175176
}

middleware/cache/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ func configDefault(config ...Config) Config {
102102

103103
// Set default values
104104
if cfg.Store != nil {
105-
log.Printf("[CACHE] Store is deprecated, please use Storage\n")
105+
log.Printf("[CACHE] - [Warning] Store is deprecated, please use Storage\n")
106106
cfg.Storage = cfg.Store
107107
}
108108
if cfg.Key != nil {
109-
log.Printf("[CACHE] Key is deprecated, please use KeyGenerator\n")
109+
log.Printf("[CACHE] - [Warning] Key is deprecated, please use KeyGenerator\n")
110110
cfg.KeyGenerator = cfg.Key
111111
}
112112
if cfg.Next == nil {

middleware/csrf/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@ func configDefault(config ...Config) Config {
132132

133133
// Set default values
134134
if cfg.TokenLookup != "" {
135-
log.Printf("[CSRF] TokenLookup is deprecated, please use KeyLookup\n")
135+
log.Printf("[CSRF] - [Warning] TokenLookup is deprecated, please use KeyLookup\n")
136136
cfg.KeyLookup = cfg.TokenLookup
137137
}
138138
if int(cfg.CookieExpires.Seconds()) > 0 {
139-
log.Printf("[CSRF] CookieExpires is deprecated, please use Expiration\n")
139+
log.Printf("[CSRF] - [Warning] CookieExpires is deprecated, please use Expiration\n")
140140
cfg.Expiration = cfg.CookieExpires
141141
}
142142
if cfg.Cookie != nil {
143-
log.Printf("[CSRF] Cookie is deprecated, please use Cookie* related fields\n")
143+
log.Printf("[CSRF] - [Warning] Cookie is deprecated, please use Cookie* related fields\n")
144144
if cfg.Cookie.Name != "" {
145145
cfg.CookieName = cfg.Cookie.Name
146146
}

middleware/idempotency/idempotency.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func New(config ...Config) fiber.Handler {
9292
}
9393
defer func() {
9494
if err := cfg.Lock.Unlock(key); err != nil {
95-
log.Printf("middleware/idempotency: failed to unlock key %q: %v", key, err)
95+
log.Printf("[IDEMPOTENCY] - [Error] failed to unlock key %q: %v", key, err)
9696
}
9797
}()
9898

middleware/limiter/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ func configDefault(config ...Config) Config {
9595

9696
// Set default values
9797
if int(cfg.Duration.Seconds()) > 0 {
98-
log.Printf("[LIMITER] Duration is deprecated, please use Expiration\n")
98+
log.Printf("[LIMITER] - [Warning] Duration is deprecated, please use Expiration\n")
9999
cfg.Expiration = cfg.Duration
100100
}
101101
if cfg.Key != nil {
102-
log.Printf("[LIMITER] Key is deprecated, please us KeyGenerator\n")
102+
log.Printf("[LIMITER] - [Warning] Key is deprecated, please us KeyGenerator\n")
103103
cfg.KeyGenerator = cfg.Key
104104
}
105105
if cfg.Store != nil {
106-
log.Printf("[LIMITER] Store is deprecated, please use Storage\n")
106+
log.Printf("[LIMITER] - [Warning] Store is deprecated, please use Storage\n")
107107
cfg.Storage = cfg.Store
108108
}
109109
if cfg.Next == nil {

middleware/proxy/proxy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
// New is deprecated
1919
func New(config Config) fiber.Handler {
20-
log.Printf("proxy.New is deprecated, please use proxy.Balancer instead\n")
20+
log.Printf("[PROXY] - [Warning] proxy.New is deprecated, please use proxy.Balancer instead\n")
2121
return Balancer(config)
2222
}
2323

middleware/session/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func configDefault(config ...Config) Config {
9797
cfg.Expiration = ConfigDefault.Expiration
9898
}
9999
if cfg.CookieName != "" {
100-
log.Printf("[session] CookieName is deprecated, please use KeyLookup\n")
100+
log.Printf("[SESSION] - [Warning] CookieName is deprecated, please use KeyLookup\n")
101101
cfg.KeyLookup = fmt.Sprintf("cookie:%s", cfg.CookieName)
102102
}
103103
if cfg.KeyLookup == "" {

middleware/timeout/timeout.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var once sync.Once
1818
// Find documentation and sample usage on https://docs.gofiber.io/api/middleware/timeout
1919
func New(handler fiber.Handler, timeout time.Duration) fiber.Handler {
2020
once.Do(func() {
21-
log.Printf("[Warning] timeout contains data race issues, not ready for production!")
21+
log.Printf("[TIMEOUT] - [Warning] timeout contains data race issues, not ready for production!")
2222
})
2323

2424
if timeout <= 0 {
@@ -32,11 +32,11 @@ func New(handler fiber.Handler, timeout time.Duration) fiber.Handler {
3232
go func() {
3333
defer func() {
3434
if err := recover(); err != nil {
35-
log.Printf("[Warning] recover error %v", err)
35+
log.Printf("[TIMEOUT] - [Warning] recover error %v", err)
3636
}
3737
}()
3838
if err := handler(ctx); err != nil {
39-
log.Printf("[Warning] handler error %v", err)
39+
log.Printf("[TIMEOUT] - [Warning] handler error %v", err)
4040
}
4141
ch <- struct{}{}
4242
}()

0 commit comments

Comments
 (0)