TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-05-20 20:52:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

show docker provider name instead of address in log

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

10
internal/proxy/provider/docker.go
View file

@ -16,23 +16,23 @@ import (
) )
type DockerProvider struct { type DockerProvider struct {
dockerHost, hostname string name, dockerHost, hostname string
ExplicitOnly bool ExplicitOnly bool
} }
var AliasRefRegex = regexp.MustCompile(`#\d+`) var AliasRefRegex = regexp.MustCompile(`#\d+`)
var AliasRefRegexOld = 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) hostname, err := D.ParseDockerHostname(dockerHost)
if err.HasError() { if err.HasError() {
return nil, err return nil, err
} }
return &DockerProvider{dockerHost, hostname, explicitOnly}, nil return &DockerProvider{name, dockerHost, hostname, explicitOnly}, nil
} }
func (p *DockerProvider) String() string { 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 { func (p *DockerProvider) NewWatcher() W.Watcher {

2
internal/proxy/provider/provider.go
View file

@ -79,7 +79,7 @@ func NewDockerProvider(name string, dockerHost string) (p *Provider, err E.Neste
} }
p = newProvider(name, ProviderTypeDocker) p = newProvider(name, ProviderTypeDocker)
p.ProviderImpl, err = DockerProviderImpl(dockerHost, p.IsExplicitOnly()) p.ProviderImpl, err = DockerProviderImpl(name, dockerHost, p.IsExplicitOnly())
if err != nil { if err != nil {
return nil, err return nil, err
} }