Skip to content

Add nil pointer check to file watcher #1249

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

Merged
merged 1 commit into from
Sep 10, 2025
Merged

Add nil pointer check to file watcher #1249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions internal/watcher/file/file_watcher_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,17 @@ func (fws *FileWatcherService) Watch(ctx context.Context, ch chan<- FileUpdateMe
}

return
case event := <-fws.watcher.Events:
fws.handleEvent(ctx, event)
case <-instanceWatcherTicker.C:
fws.checkForUpdates(ctx, ch)
case watcherError := <-fws.watcher.Errors:
slog.ErrorContext(ctx, "Unexpected error in file watcher", "error", watcherError)
}

if fws.watcher != nil {
select {
case event := <-fws.watcher.Events:
fws.handleEvent(ctx, event)
case watcherError := <-fws.watcher.Errors:
slog.ErrorContext(ctx, "Unexpected error in file watcher", "error", watcherError)
}
}
}
}
Expand Down