Skip to content

Commit 24ece16

Browse files
burgesQsagikazarmark
authored andcommitted
drop std' logger in favor of jww one
1 parent 98b1b9f commit 24ece16

File tree

1 file changed

+11
-20
lines changed

1 file changed

+11
-20
lines changed

viper.go

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"errors"
2626
"fmt"
2727
"io"
28-
"log"
2928
"os"
3029
"path/filepath"
3130
"reflect"
@@ -205,7 +204,6 @@ type Viper struct {
205204
automaticEnvApplied bool
206205
envKeyReplacer StringReplacer
207206
allowEmptyEnv bool
208-
logMessage bool
209207

210208
parents []string
211209
config map[string]interface{}
@@ -243,7 +241,6 @@ func New() *Viper {
243241
v.aliases = make(map[string]string)
244242
v.typeByDefValue = false
245243
v.logger = jwwLogger{}
246-
v.logMessage = true
247244

248245
v.resetEncoding()
249246

@@ -272,14 +269,6 @@ func KeyDelimiter(d string) Option {
272269
})
273270
}
274271

275-
// DisableMessageLog block any kind of messages to be logged.
276-
// By default, all messages are logged.
277-
func DisableMessageLog() Option {
278-
return optionFunc(func(v *Viper) {
279-
v.logMessage = false
280-
})
281-
}
282-
283272
// StringReplacer applies a set of replacements to a string.
284273
type StringReplacer interface {
285274
// Replace returns a copy of s with all replacements performed.
@@ -450,16 +439,17 @@ func (v *Viper) WatchConfig() {
450439
initWG.Add(1)
451440
go func() {
452441
watcher, err := newWatcher()
453-
if err != nil && v.logMessage {
454-
log.Fatal(err)
442+
if err != nil {
443+
v.logger.Error("failure to create watcher",
444+
"msg", err.Error())
445+
os.Exit(1)
455446
}
456447
defer watcher.Close()
457448
// we have to watch the entire directory to pick up renames/atomic saves in a cross-platform way
458449
filename, err := v.getConfigFile()
459450
if err != nil {
460-
if v.logMessage {
461-
log.Printf("error: %v\n", err)
462-
}
451+
v.logger.Error("get config file",
452+
"msg", err.Error())
463453
initWG.Done()
464454
return
465455
}
@@ -487,8 +477,9 @@ func (v *Viper) WatchConfig() {
487477
(currentConfigFile != "" && currentConfigFile != realConfigFile) {
488478
realConfigFile = currentConfigFile
489479
err := v.ReadInConfig()
490-
if err != nil && v.logMessage {
491-
log.Printf("error reading config file: %v\n", err)
480+
if err != nil {
481+
v.logger.Error("reading config file",
482+
"msg", err.Error())
492483
}
493484
if v.onConfigChange != nil {
494485
v.onConfigChange(event)
@@ -499,8 +490,8 @@ func (v *Viper) WatchConfig() {
499490
}
500491

501492
case err, ok := <-watcher.Errors:
502-
if ok && v.logMessage { // 'Errors' channel is not closed
503-
log.Printf("watcher error: %v\n", err)
493+
if ok { // 'Errors' channel is not closed
494+
v.logger.Error("watcher error", "msg", err.Error())
504495
}
505496
eventsWG.Done()
506497
return

0 commit comments

Comments
 (0)