Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use AgentServiceCheck.Args when registering Consul script/container checks #627

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use AgentServiceCheck.Args when registering Consul script/container checks #627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions consul/consul.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ func (r *ConsulAdapter) buildCheck(service *bridge.Service) *consulapi.AgentServ
check.Timeout = timeout
}
} else if cmd := service.Attrs["check_cmd"]; cmd != "" {
check.Script = fmt.Sprintf("check-cmd %s %s %s", service.Origin.ContainerID[:12], service.Origin.ExposedPort, cmd)
check.Args = strings.Split(fmt.Sprintf("check-cmd %s %s %s", service.Origin.ContainerID[:12], service.Origin.ExposedPort, cmd), " ")
} else if script := service.Attrs["check_script"]; script != "" {
check.Script = r.interpolateService(script, service)
check.Args = strings.Split(r.interpolateService(script, service), " ")
} else if ttl := service.Attrs["check_ttl"]; ttl != "" {
check.TTL = ttl
} else if tcp := service.Attrs["check_tcp"]; tcp != "" {
Expand All @@ -118,7 +118,7 @@ func (r *ConsulAdapter) buildCheck(service *bridge.Service) *consulapi.AgentServ
} else {
return nil
}
if check.Script != "" || check.HTTP != "" || check.TCP != "" {
if len(check.Args) > 0 || check.HTTP != "" || check.TCP != "" {
if interval := service.Attrs["check_interval"]; interval != "" {
check.Interval = interval
} else {
Expand Down