mirror of
https://github.com/yusing/godoxy.git
synced 2026-04-25 02:09:01 +02:00
fix: build error
This commit is contained in:
@@ -6,7 +6,6 @@ import (
|
|||||||
|
|
||||||
"github.com/docker/docker/api/types/container"
|
"github.com/docker/docker/api/types/container"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/moby/moby/api/types/container"
|
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
gperr "github.com/yusing/goutils/errs"
|
gperr "github.com/yusing/goutils/errs"
|
||||||
|
|
||||||
@@ -43,12 +42,12 @@ func GetContainers(ctx context.Context, dockerClients DockerClients) ([]Containe
|
|||||||
for server, dockerClient := range dockerClients {
|
for server, dockerClient := range dockerClients {
|
||||||
conts, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true})
|
conts, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errs.AddSubject(err, name)
|
errs.AddSubject(err, server)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
for _, cont := range conts {
|
for _, cont := range conts {
|
||||||
containers = append(containers, Container{
|
containers = append(containers, Container{
|
||||||
Server: name,
|
Server: server,
|
||||||
Name: cont.Names[0],
|
Name: cont.Names[0],
|
||||||
ID: cont.ID,
|
ID: cont.ID,
|
||||||
Image: cont.Image,
|
Image: cont.Image,
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
|
"github.com/yusing/goutils/events"
|
||||||
)
|
)
|
||||||
|
|
||||||
type WakeEvent struct {
|
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")
|
w.l.Debug().Str("event", string(eventType)).Str("message", message).Err(err).Msg("sending event")
|
||||||
|
|
||||||
level := gevents.LevelInfo
|
level := events.LevelInfo
|
||||||
if eventType == WakeEventError {
|
if eventType == WakeEventError {
|
||||||
level = gevents.LevelError
|
level = events.LevelError
|
||||||
}
|
}
|
||||||
|
|
||||||
w.events.Add(gevents.NewEvent(
|
w.events.Add(events.NewEvent(
|
||||||
level,
|
level,
|
||||||
w.cfg.ContainerName(),
|
w.cfg.ContainerName(),
|
||||||
string(eventType),
|
string(eventType),
|
||||||
|
|||||||
Reference in New Issue
Block a user