show docker provider name instead of address in log

This commit is contained in:
yusing 2024-10-04 07:21:49 +08:00
parent 245f073350
commit 6211ddcdf0
2 changed files with 6 additions and 6 deletions

View file

@ -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 {

View file

@ -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
}