@@ -25,7 +25,6 @@ import (
25
25
"errors"
26
26
"fmt"
27
27
"io"
28
- "log"
29
28
"os"
30
29
"path/filepath"
31
30
"reflect"
@@ -205,7 +204,6 @@ type Viper struct {
205
204
automaticEnvApplied bool
206
205
envKeyReplacer StringReplacer
207
206
allowEmptyEnv bool
208
- logMessage bool
209
207
210
208
parents []string
211
209
config map [string ]interface {}
@@ -243,7 +241,6 @@ func New() *Viper {
243
241
v .aliases = make (map [string ]string )
244
242
v .typeByDefValue = false
245
243
v .logger = jwwLogger {}
246
- v .logMessage = true
247
244
248
245
v .resetEncoding ()
249
246
@@ -272,14 +269,6 @@ func KeyDelimiter(d string) Option {
272
269
})
273
270
}
274
271
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
-
283
272
// StringReplacer applies a set of replacements to a string.
284
273
type StringReplacer interface {
285
274
// Replace returns a copy of s with all replacements performed.
@@ -450,16 +439,17 @@ func (v *Viper) WatchConfig() {
450
439
initWG .Add (1 )
451
440
go func () {
452
441
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 )
455
446
}
456
447
defer watcher .Close ()
457
448
// we have to watch the entire directory to pick up renames/atomic saves in a cross-platform way
458
449
filename , err := v .getConfigFile ()
459
450
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 ())
463
453
initWG .Done ()
464
454
return
465
455
}
@@ -487,8 +477,9 @@ func (v *Viper) WatchConfig() {
487
477
(currentConfigFile != "" && currentConfigFile != realConfigFile ) {
488
478
realConfigFile = currentConfigFile
489
479
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 ())
492
483
}
493
484
if v .onConfigChange != nil {
494
485
v .onConfigChange (event )
@@ -499,8 +490,8 @@ func (v *Viper) WatchConfig() {
499
490
}
500
491
501
492
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 () )
504
495
}
505
496
eventsWG .Done ()
506
497
return
0 commit comments