Skip to content

Commit

Permalink
add:viper: allow to disable internal log messages
Browse files Browse the repository at this point in the history
  • Loading branch information
burgesQ authored and sagikazarmark committed May 29, 2023
1 parent 2ee1631 commit 98b1b9f
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions viper.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ type Viper struct {
automaticEnvApplied bool
envKeyReplacer StringReplacer
allowEmptyEnv bool
logMessage bool

parents []string
config map[string]interface{}
Expand Down Expand Up @@ -242,6 +243,7 @@ func New() *Viper {
v.aliases = make(map[string]string)
v.typeByDefValue = false
v.logger = jwwLogger{}
v.logMessage = true

v.resetEncoding()

Expand Down Expand Up @@ -270,6 +272,14 @@ func KeyDelimiter(d string) Option {
})
}

// DisableMessageLog block any kind of messages to be logged.
// By default, all messages are logged.
func DisableMessageLog() Option {
return optionFunc(func(v *Viper) {
v.logMessage = false
})
}

// StringReplacer applies a set of replacements to a string.
type StringReplacer interface {
// Replace returns a copy of s with all replacements performed.
Expand Down Expand Up @@ -440,14 +450,16 @@ func (v *Viper) WatchConfig() {
initWG.Add(1)
go func() {
watcher, err := newWatcher()
if err != nil {
if err != nil && v.logMessage {
log.Fatal(err)
}
defer watcher.Close()
// we have to watch the entire directory to pick up renames/atomic saves in a cross-platform way
filename, err := v.getConfigFile()
if err != nil {
log.Printf("error: %v\n", err)
if v.logMessage {
log.Printf("error: %v\n", err)
}
initWG.Done()
return
}
Expand Down Expand Up @@ -475,7 +487,7 @@ func (v *Viper) WatchConfig() {
(currentConfigFile != "" && currentConfigFile != realConfigFile) {
realConfigFile = currentConfigFile
err := v.ReadInConfig()
if err != nil {
if err != nil && v.logMessage {
log.Printf("error reading config file: %v\n", err)
}
if v.onConfigChange != nil {
Expand All @@ -487,7 +499,7 @@ func (v *Viper) WatchConfig() {
}

case err, ok := <-watcher.Errors:
if ok { // 'Errors' channel is not closed
if ok && v.logMessage { // 'Errors' channel is not closed
log.Printf("watcher error: %v\n", err)
}
eventsWG.Done()
Expand Down

0 comments on commit 98b1b9f

Please sign in to comment.