mirror
/
viper
mirror of https://github.com/spf13/viper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

feat: add a cancel function return from WatchConfig() to stop watching manually

This commit is contained in:
chowyi 2023-07-07 16:24:44 +08:00
parent 097e0d888f
commit 6fb91e06ef
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
viper.go
View File

@ -21,6 +21,7 @@ package viper
import ( import (
"bytes" "bytes"
"context"
"encoding/csv" "encoding/csv"
"errors" "errors"
"fmt" "fmt"
@ -431,10 +432,13 @@ func (v *Viper) OnConfigChange(run func(in fsnotify.Event)) {
} }
// WatchConfig starts watching a config file for changes. // WatchConfig starts watching a config file for changes.
func WatchConfig() { v.WatchConfig() } // The function returned for stop watching manually.
func WatchConfig() func() { return v.WatchConfig() }
// WatchConfig starts watching a config file for changes. // WatchConfig starts watching a config file for changes.
func (v *Viper) WatchConfig() { // The function returned for stop watching manually.
func (v *Viper) WatchConfig() func() {
ctx, cancel := context.WithCancel(context.Background())
initWG := sync.WaitGroup{} initWG := sync.WaitGroup{}
initWG.Add(1) initWG.Add(1)
go func() { go func() {
@ -492,6 +496,8 @@ func (v *Viper) WatchConfig() {
} }
eventsWG.Done() eventsWG.Done()
return return
case <-ctx.Done(): // cancel function called
watcher.Close()
} }
} }
}() }()
@ -500,6 +506,7 @@ func (v *Viper) WatchConfig() {
eventsWG.Wait() // now, wait for event loop to end in this go-routine... eventsWG.Wait() // now, wait for event loop to end in this go-routine...
}() }()
initWG.Wait() // make sure that the go routine above fully ended before returning initWG.Wait() // make sure that the go routine above fully ended before returning
return cancel
} }
// SetConfigFile explicitly defines the path, name and extension of the config file. // SetConfigFile explicitly defines the path, name and extension of the config file.