glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2025-05-07 12:47:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #654: OnConfigChangeErr callback

Browse source
This commit is contained in:
Sergey Basov 2019-02-25 14:17:10 +03:00
parent d104d259b3
commit d4432fc0cd
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
viper.go
View file

@ -202,7 +202,8 @@ type Viper struct {
// This will only be used if the configuration read is a properties file. // This will only be used if the configuration read is a properties file.
properties *properties.Properties properties *properties.Properties
onConfigChange func(fsnotify.Event) onConfigChange func(fsnotify.Event)
onConfigChangeErr func(err error)
} }
// New returns an initialized Viper instance. // New returns an initialized Viper instance.
@ -276,6 +277,10 @@ func OnConfigChange(run func(in fsnotify.Event)) { v.OnConfigChange(run) }
func (v *Viper) OnConfigChange(run func(in fsnotify.Event)) { func (v *Viper) OnConfigChange(run func(in fsnotify.Event)) {
v.onConfigChange = run v.onConfigChange = run
} }
func OnConfigChangeErr(run func(err error)) { v.OnConfigChangeErr(run) }
func (v *Viper) OnConfigChangeErr(run func(err error)) {
v.onConfigChangeErr = run
}
func WatchConfig() { v.WatchConfig() } func WatchConfig() { v.WatchConfig() }
@ -291,6 +296,9 @@ func (v *Viper) WatchConfig() {
// we have to watch the entire directory to pick up renames/atomic saves in a cross-platform way // we have to watch the entire directory to pick up renames/atomic saves in a cross-platform way
filename, err := v.getConfigFile() filename, err := v.getConfigFile()
if err != nil { if err != nil {
if v.onConfigChangeErr != nil {
v.onConfigChangeErr(err)
}
log.Printf("error: %v\n", err) log.Printf("error: %v\n", err)
return return
} }
@ -320,6 +328,9 @@ func (v *Viper) WatchConfig() {
realConfigFile = currentConfigFile realConfigFile = currentConfigFile
err := v.ReadInConfig() err := v.ReadInConfig()
if err != nil { if err != nil {
if v.onConfigChangeErr != nil {
v.onConfigChangeErr(err)
}
log.Printf("error reading config file: %v\n", err) log.Printf("error reading config file: %v\n", err)
} }
if v.onConfigChange != nil { if v.onConfigChange != nil {
@ -333,6 +344,9 @@ func (v *Viper) WatchConfig() {
case err, ok := <-watcher.Errors: case err, ok := <-watcher.Errors:
if ok { // 'Errors' channel is not closed if ok { // 'Errors' channel is not closed
if v.onConfigChangeErr != nil {
v.onConfigChangeErr(err)
}
log.Printf("watcher error: %v\n", err) log.Printf("watcher error: %v\n", err)
} }
eventsWG.Done() eventsWG.Done()