starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-23 08:48:32 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

refactor, fix reload error when using agents, and other small improvements

Browse Source
This commit is contained in:
yusing
2025-02-11 12:15:51 +08:00
parent b1f72620dc
commit 429a77de8e
10 changed files with 139 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/route/provider/agent.go
View File

@@ -14,7 +14,7 @@ type AgentProvider struct {
}
func (p *AgentProvider) ShortName() string {
return p.Name()
return p.AgentConfig.Name()
}
func (p *AgentProvider) NewWatcher() watcher.Watcher {

3
internal/route/provider/docker_test.go
View File

@@ -39,8 +39,7 @@ func makeRoutes(cont *types.Container, dockerHostIP ...string) route.Routes {
}
func TestExplicitOnly(t *testing.T) {
p, err := NewDockerProvider("a!", "")
ExpectNoError(t, err)
p := NewDockerProvider("a!", "")
ExpectTrue(t, p.IsExplicitOnly())
}

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

@@ -59,15 +59,11 @@ func NewFileProvider(filename string) (p *Provider, err error) {
return
}
func NewDockerProvider(name string, dockerHost string) (p *Provider, err error) {
if name == "" {
return nil, ErrEmptyProviderName
}
p = newProvider(types.ProviderTypeDocker)
func NewDockerProvider(name string, dockerHost string) *Provider {
p := newProvider(types.ProviderTypeDocker)
p.ProviderImpl = DockerProviderImpl(name, dockerHost)
p.watcher = p.NewWatcher()
return
return p
}
func NewAgentProvider(cfg *agent.AgentConfig) *Provider {
@@ -127,10 +123,6 @@ func (p *Provider) Start(parent task.Parent) E.Error {
if err := errs.Error(); err != nil {
return err.Subject(p.String())
}
if p.t == types.ProviderTypeAgent {
t.OnCancel("remove agent", p.ProviderImpl.(*AgentProvider).AgentConfig.Remove)
}
return nil
}