From 58a2dc73dde6b124df865c0b880d76a68d1a9672 Mon Sep 17 00:00:00 2001
From: yusing <yusing@6uo.me>
Date: Sat, 13 Sep 2025 23:50:13 +0800
Subject: [PATCH] refactor(docker_watcher): rename docker_events to
 dockerEvents

---
 internal/watcher/docker_watcher.go | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/internal/watcher/docker_watcher.go b/internal/watcher/docker_watcher.go
index 1a01f9e0..bdc154ed 100644
--- a/internal/watcher/docker_watcher.go
+++ b/internal/watcher/docker_watcher.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"time"
 
-	docker_events "github.com/docker/docker/api/types/events"
+	dockerEvents "github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/client"
 	"github.com/rs/zerolog/log"
@@ -16,19 +16,19 @@ import (
 
 type (
 	DockerWatcher     string
-	DockerListOptions = docker_events.ListOptions
+	DockerListOptions = dockerEvents.ListOptions
 )
 
 // https://docs.docker.com/reference/api/engine/version/v1.47/#tag/System/operation/SystemPingHead
 var (
-	DockerFilterContainer = filters.Arg("type", string(docker_events.ContainerEventType))
-	DockerFilterStart     = filters.Arg("event", string(docker_events.ActionStart))
-	DockerFilterStop      = filters.Arg("event", string(docker_events.ActionStop))
-	DockerFilterDie       = filters.Arg("event", string(docker_events.ActionDie))
-	DockerFilterDestroy   = filters.Arg("event", string(docker_events.ActionDestroy))
-	DockerFilterKill      = filters.Arg("event", string(docker_events.ActionKill))
-	DockerFilterPause     = filters.Arg("event", string(docker_events.ActionPause))
-	DockerFilterUnpause   = filters.Arg("event", string(docker_events.ActionUnPause))
+	DockerFilterContainer = filters.Arg("type", string(dockerEvents.ContainerEventType))
+	DockerFilterStart     = filters.Arg("event", string(dockerEvents.ActionStart))
+	DockerFilterStop      = filters.Arg("event", string(dockerEvents.ActionStop))
+	DockerFilterDie       = filters.Arg("event", string(dockerEvents.ActionDie))
+	DockerFilterDestroy   = filters.Arg("event", string(dockerEvents.ActionDestroy))
+	DockerFilterKill      = filters.Arg("event", string(dockerEvents.ActionKill))
+	DockerFilterPause     = filters.Arg("event", string(dockerEvents.ActionPause))
+	DockerFilterUnpause   = filters.Arg("event", string(dockerEvents.ActionUnPause))
 
 	NewDockerFilter = filters.NewArgs
 
@@ -102,6 +102,7 @@ func (w DockerWatcher) EventsWithOptions(ctx context.Context, options DockerList
 				retry := time.NewTicker(dockerWatcherRetryInterval)
 				defer retry.Stop()
 				ok := false
+			outer:
 				for !ok {
 					select {
 					case <-ctx.Done():
@@ -109,7 +110,7 @@ func (w DockerWatcher) EventsWithOptions(ctx context.Context, options DockerList
 					case <-retry.C:
 						if checkConnection(ctx, client) {
 							ok = true
-							break
+							break outer
 						}
 					}
 				}
@@ -134,7 +135,7 @@ func (w DockerWatcher) parseError(err error) gperr.Error {
 	return gperr.Wrap(err)
 }
 
-func (w DockerWatcher) handleEvent(event docker_events.Message, ch chan<- Event) {
+func (w DockerWatcher) handleEvent(event dockerEvents.Message, ch chan<- Event) {
 	action, ok := events.DockerEventMap[event.Action]
 	if !ok {
 		return