From 54450924dc39d3665530e7e15e87452fd9cff965 Mon Sep 17 00:00:00 2001 From: yusing Date: Mon, 16 Feb 2026 10:23:59 +0800 Subject: [PATCH] fix: build error --- internal/api/v1/docker/containers.go | 5 ++--- internal/idlewatcher/events.go | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/internal/api/v1/docker/containers.go b/internal/api/v1/docker/containers.go index c6ddfa56..aa832009 100644 --- a/internal/api/v1/docker/containers.go +++ b/internal/api/v1/docker/containers.go @@ -6,7 +6,6 @@ import ( "github.com/docker/docker/api/types/container" "github.com/gin-gonic/gin" - "github.com/moby/moby/api/types/container" "github.com/rs/zerolog/log" gperr "github.com/yusing/goutils/errs" @@ -43,12 +42,12 @@ func GetContainers(ctx context.Context, dockerClients DockerClients) ([]Containe for server, dockerClient := range dockerClients { conts, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true}) if err != nil { - errs.AddSubject(err, name) + errs.AddSubject(err, server) continue } for _, cont := range conts { containers = append(containers, Container{ - Server: name, + Server: server, Name: cont.Names[0], ID: cont.ID, Image: cont.Image, diff --git a/internal/idlewatcher/events.go b/internal/idlewatcher/events.go index 64c63f9b..3eb14fe2 100644 --- a/internal/idlewatcher/events.go +++ b/internal/idlewatcher/events.go @@ -4,6 +4,8 @@ import ( "encoding/json" "fmt" "io" + + "github.com/yusing/goutils/events" ) type WakeEvent struct { @@ -56,12 +58,12 @@ func (w *Watcher) sendEvent(eventType WakeEventType, message string, err error) w.l.Debug().Str("event", string(eventType)).Str("message", message).Err(err).Msg("sending event") - level := gevents.LevelInfo + level := events.LevelInfo if eventType == WakeEventError { - level = gevents.LevelError + level = events.LevelError } - w.events.Add(gevents.NewEvent( + w.events.Add(events.NewEvent( level, w.cfg.ContainerName(), string(eventType),