kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 02:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1562 from dbresson/support-query-strings-in-checks

Browse Source 
support query strings in checks
This commit is contained in:
Diptanu Choudhury
2016-08-12 13:06:02 -07:00
committed by GitHub
parent 4f79c017b5 e41b70ca7d
commit 0d35216164
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
command/agent/consul/syncer.go
View File

@@ -703,11 +703,15 @@ func (c *Syncer) createCheckReg(check *structs.ServiceCheck, serviceReg *consul.
if check.Protocol == "" {
check.Protocol = "http"
}
url := url.URL{
base := url.URL{
Scheme: check.Protocol,
Host: net.JoinHostPort(host, strconv.Itoa(port)),
Path: check.Path,
}
relative, err := url.Parse(check.Path)
if err != nil {
return nil, err
}
url := base.ResolveReference(relative)
chkReg.HTTP = url.String()
case structs.ServiceCheckTCP:
chkReg.TCP = net.JoinHostPort(host, strconv.Itoa(port))

21
command/agent/consul/syncer_test.go
View File

@@ -33,6 +33,14 @@ var (
Interval: 3 * time.Second,
Timeout: 1 * time.Second,
}
check3 = structs.ServiceCheck{
Name: "check3",
Type: "http",
PortLabel: "port3",
Path: "/health?p1=1&p2=2",
Interval: 3 * time.Second,
Timeout: 1 * time.Second,
}
service1 = structs.Service{
Name: "foo-1",
Tags: []string{"tag1", "tag2"},
@@ -61,6 +69,7 @@ func TestCheckRegistration(t *testing.T) {
srvReg, _ := cs.createService(&service1, "domain", "key")
check1Reg, _ := cs.createCheckReg(&check1, srvReg)
check2Reg, _ := cs.createCheckReg(&check2, srvReg)
check3Reg, _ := cs.createCheckReg(&check3, srvReg)
expected := "10.10.11.5:20002"
if check1Reg.TCP != expected {
@@ -69,8 +78,14 @@ func TestCheckRegistration(t *testing.T) {
expected = "10.10.11.5:20003"
if check2Reg.TCP != expected {
t.Fatalf("expected: %v, actual: %v", expected, check1Reg.TCP)
t.Fatalf("expected: %v, actual: %v", expected, check2Reg.TCP)
}
expected = "http://10.10.11.5:20004/health?p1=1&p2=2"
if check3Reg.HTTP != expected {
t.Fatalf("expected: %v, actual: %v", expected, check3Reg.HTTP)
}
}
func TestConsulServiceRegisterServices(t *testing.T) {
@@ -208,6 +223,10 @@ func mockTask() *structs.Task {
Label: "port2",
Value: 20003,
},
structs.Port{
Label: "port3",
Value: 20004,
},
},
},
},