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

Using the service id in check hash

Browse Source
This commit is contained in:
Diptanu Choudhury
2015-11-25 15:17:27 -08:00
parent beebb7cc14
commit 84a61a9fcd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/consul.go
View File

@@ -270,7 +270,7 @@ func (c *ConsulService) makeChecks(service *structs.Service, ip string, port int
check.Name = fmt.Sprintf("service: '%s' check", service.Name)
}
cr := &consul.AgentCheckRegistration{
ID: check.Hash(),
ID: check.Hash(service.Id),
Name: check.Name,
ServiceID: service.Id,
}

3
nomad/structs/structs.go
View File

@@ -1040,8 +1040,9 @@ func (sc *ServiceCheck) Validate() error {
return nil
}
func (sc *ServiceCheck) Hash() string {
func (sc *ServiceCheck) Hash(serviceId string) string {
h := sha1.New()
io.WriteString(h, serviceId)
io.WriteString(h, sc.Name)
io.WriteString(h, sc.Type)
io.WriteString(h, sc.Script)