TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-05-20 12:42:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix idlewatcher nil dereference

Browse source
This commit is contained in:
yusing 2025-01-01 14:25:44 +08:00
parent 89f08f0da7
commit a0a81240ce
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/docker/idlewatcher/watcher.go
View file

@ -209,7 +209,7 @@ func (w *Watcher) resetIdleTimer() {
w.ticker.Reset(w.IdleTimeout) w.ticker.Reset(w.IdleTimeout)
} }
func (w *Watcher) getEventCh(dockerWatcher watcher.DockerWatcher) (eventTask *task.Task, eventCh <-chan events.Event, errCh <-chan E.Error) { func (w *Watcher) getEventCh(dockerWatcher watcher.DockerWatcher) (eventCh <-chan events.Event, errCh <-chan E.Error) {
eventCh, errCh = dockerWatcher.EventsWithOptions(w.Task().Context(), watcher.DockerListOptions{ eventCh, errCh = dockerWatcher.EventsWithOptions(w.Task().Context(), watcher.DockerListOptions{
Filters: watcher.NewDockerFilter( Filters: watcher.NewDockerFilter(
watcher.DockerFilterContainer, watcher.DockerFilterContainer,
@ -239,8 +239,7 @@ func (w *Watcher) getEventCh(dockerWatcher watcher.DockerWatcher) (eventTask *ta
// errors occurred on docker client, or route provider died (mainly caused by config reload). // errors occurred on docker client, or route provider died (mainly caused by config reload).
func (w *Watcher) watchUntilDestroy() (returnCause error) { func (w *Watcher) watchUntilDestroy() (returnCause error) {
dockerWatcher := watcher.NewDockerWatcherWithClient(w.client) dockerWatcher := watcher.NewDockerWatcherWithClient(w.client)
eventTask, dockerEventCh, dockerEventErrCh := w.getEventCh(dockerWatcher) dockerEventCh, dockerEventErrCh := w.getEventCh(dockerWatcher)
defer eventTask.Finish("stopped")
for { for {
select { select {
@ -279,8 +278,7 @@ func (w *Watcher) watchUntilDestroy() (returnCause error) {
w.Debug().Msgf("id changed %s -> %s", w.ContainerID, e.ActorID) w.Debug().Msgf("id changed %s -> %s", w.ContainerID, e.ActorID)
w.ContainerID = e.ActorID w.ContainerID = e.ActorID
// recreate event stream // recreate event stream
eventTask.Finish("recreate event stream") dockerEventCh, dockerEventErrCh = w.getEventCh(dockerWatcher)
eventTask, dockerEventCh, dockerEventErrCh = w.getEventCh(dockerWatcher)
} }
case <-w.ticker.C: case <-w.ticker.C:
w.ticker.Stop() w.ticker.Stop()

8
internal/task/utils.go
View file

@ -16,9 +16,11 @@ var ErrProgramExiting = errors.New("program exiting")
var logger = logging.With().Str("module", "task").Logger() var logger = logging.With().Str("module", "task").Logger()
var root = newRoot() var (
var allTasks = F.NewSet[*Task]() root = newRoot()
var allTasksWg sync.WaitGroup allTasks = F.NewSet[*Task]()
allTasksWg sync.WaitGroup
)
func testCleanup() { func testCleanup() {
root = newRoot() root = newRoot()