From 6211ddcdf070660de510637c2f5217a6bc779007 Mon Sep 17 00:00:00 2001 From: yusing Date: Fri, 4 Oct 2024 07:21:49 +0800 Subject: [PATCH] show docker provider name instead of address in log --- internal/proxy/provider/docker.go | 10 +++++----- internal/proxy/provider/provider.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/proxy/provider/docker.go b/internal/proxy/provider/docker.go index 2a06c63..b285e6c 100755 --- a/internal/proxy/provider/docker.go +++ b/internal/proxy/provider/docker.go @@ -16,23 +16,23 @@ import ( ) type DockerProvider struct { - dockerHost, hostname string - ExplicitOnly bool + name, dockerHost, hostname string + ExplicitOnly bool } var AliasRefRegex = regexp.MustCompile(`#\d+`) var AliasRefRegexOld = regexp.MustCompile(`\$\d+`) -func DockerProviderImpl(dockerHost string, explicitOnly bool) (ProviderImpl, E.NestedError) { +func DockerProviderImpl(name, dockerHost string, explicitOnly bool) (ProviderImpl, E.NestedError) { hostname, err := D.ParseDockerHostname(dockerHost) if err.HasError() { return nil, err } - return &DockerProvider{dockerHost, hostname, explicitOnly}, nil + return &DockerProvider{name, dockerHost, hostname, explicitOnly}, nil } func (p *DockerProvider) String() string { - return fmt.Sprintf("docker:%s", p.dockerHost) + return fmt.Sprintf("docker: %s", p.name) } func (p *DockerProvider) NewWatcher() W.Watcher { diff --git a/internal/proxy/provider/provider.go b/internal/proxy/provider/provider.go index d75467a..b17044c 100644 --- a/internal/proxy/provider/provider.go +++ b/internal/proxy/provider/provider.go @@ -79,7 +79,7 @@ func NewDockerProvider(name string, dockerHost string) (p *Provider, err E.Neste } p = newProvider(name, ProviderTypeDocker) - p.ProviderImpl, err = DockerProviderImpl(dockerHost, p.IsExplicitOnly()) + p.ProviderImpl, err = DockerProviderImpl(name, dockerHost, p.IsExplicitOnly()) if err != nil { return nil, err }