starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-03-24 01:51:10 +01:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

refactor(docker): update ListContainers function to accept context and improve timeout handling

Browse Source
This commit is contained in:
yusing
2025-09-13 23:55:47 +08:00
parent 2c290a3916
commit 1e9303b1ef
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/docker/list_containers.go
View File

@@ -2,8 +2,6 @@ package docker
import (
"context"
"errors"
"time"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/client"
@@ -21,16 +19,13 @@ var listOptions = container.ListOptions{
All: true,
}
func ListContainers(clientHost string) ([]container.Summary, error) {
func ListContainers(ctx context.Context, clientHost string) ([]container.Summary, error) {
dockerClient, err := NewClient(clientHost)
if err != nil {
return nil, err
}
defer dockerClient.Close()
ctx, cancel := context.WithTimeoutCause(context.Background(), 3*time.Second, errors.New("list containers timeout"))
defer cancel()
containers, err := dockerClient.ContainerList(ctx, listOptions)
if err != nil {
return nil, err

12
internal/route/provider/docker.go
View File

@@ -1,14 +1,14 @@
package provider
import (
"context"
"fmt"
"strconv"
"time"
"github.com/docker/docker/client"
"github.com/goccy/go-yaml"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/common"
"github.com/yusing/go-proxy/internal/docker"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/route"
@@ -31,9 +31,6 @@ const (
var ErrAliasRefIndexOutOfRange = gperr.New("index out of range")
func DockerProviderImpl(name, dockerHost string) ProviderImpl {
if dockerHost == common.DockerHostFromEnv {
dockerHost = common.GetEnvString("DOCKER_HOST", client.DefaultDockerHost)
}
return &DockerProvider{
name,
dockerHost,
@@ -62,7 +59,10 @@ func (p *DockerProvider) NewWatcher() watcher.Watcher {
}
func (p *DockerProvider) loadRoutesImpl() (route.Routes, gperr.Error) {
containers, err := docker.ListContainers(p.dockerHost)
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
containers, err := docker.ListContainers(ctx, p.dockerHost)
if err != nil {
return nil, gperr.Wrap(err)
}

6
internal/route/provider/provider.go
View File

@@ -8,8 +8,10 @@ import (
"sync"
"time"
"github.com/docker/docker/client"
"github.com/rs/zerolog"
"github.com/yusing/go-proxy/agent/pkg/agent"
"github.com/yusing/go-proxy/internal/common"
"github.com/yusing/go-proxy/internal/docker"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/route"
@@ -67,6 +69,10 @@ func NewFileProvider(filename string) (p *Provider, err error) {
}
func NewDockerProvider(name string, dockerHost string) *Provider {
if dockerHost == common.DockerHostFromEnv {
dockerHost = common.GetEnvString("DOCKER_HOST", client.DefaultDockerHost)
}
p := newProvider(provider.ProviderTypeDocker)
p.ProviderImpl = DockerProviderImpl(name, dockerHost)
p.watcher = p.NewWatcher()