Skip to content

debounce and improve config file watcher #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
redneck-f25 wants to merge 3 commits into
base: master
Choose a base branch
from
+54 −10
Open

debounce and improve config file watcher #587

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a86068
debounce and improve config file watcher
redneck-f25 May 15, 2026
705d631
drain fsnotify watcher Error channel
redneck-f25 May 16, 2026
c05d1b7
Merge branch 'vendor/master' into contrib/improve-config-file-watcher
redneck-f25 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions share/settings/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ import (
"errors"
"fmt"
"os"
"path/filepath"
"regexp"
"runtime"
"strings"
"sync"
"time"

"github.com/fsnotify/fsnotify"
"github.com/jpillora/chisel/share/cio"
Expand Down Expand Up @@ -102,19 +106,37 @@ func (u *UserIndex) addWatchEvents() error {
if err != nil {
return err
}
if err := watcher.Add(u.configFile); err != nil {
var configPath, _ = filepath.Abs(u.configFile)
if err := watcher.Add(filepath.Dir(configPath)); err != nil {
Comment thread
redneck-f25 marked this conversation as resolved.
Outdated
return err
}
go func() {
var debounceTimer *time.Timer
var debounceMutex sync.Mutex
for e := range watcher.Events {
Comment thread
redneck-f25 marked this conversation as resolved.
Outdated
if e.Op&fsnotify.Write != fsnotify.Write {
eventPath, _ := filepath.Abs(e.Name)
if runtime.GOOS == "windows" {
if !strings.EqualFold(eventPath, configPath) {
continue
}
} else if eventPath != configPath {
continue
}
if err := u.loadUserIndex(); err != nil {
u.Infof("Failed to reload the users configuration: %s", err)
} else {
u.Debugf("Users configuration successfully reloaded from: %s", u.configFile)
if e.Op&(fsnotify.Write|fsnotify.Create|fsnotify.Rename) == 0 {
continue
}
if debounceTimer != nil {
debounceTimer.Stop()
}
debounceTimer = time.AfterFunc(200*time.Millisecond, func() {
Comment thread
redneck-f25 marked this conversation as resolved.
Outdated
debounceMutex.Lock()
defer debounceMutex.Unlock()
if err := u.loadUserIndex(); err != nil {
u.Infof("Failed to reload the users configuration: %s", err)
} else {
u.Debugf("Users configuration successfully reloaded from: %s", u.configFile)
}
})
}
}()
return nil
Expand Down