status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes #1775; Removes 'unknown' state 

Signed-off-by: Abhinav Dahiya <abhinavdtu2012@gmail.com>
This commit is contained in:
Abhinav Dahiya 2016-07-30 19:33:14 +05:30
parent 6af6baf02c
commit 7c6c3b38bc
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/health.go
View File

@ -8,7 +8,6 @@ const (
// HealthAny is special, and is used as a wild card, // HealthAny is special, and is used as a wild card,
// not as a specific state. // not as a specific state.
HealthAny = "any" HealthAny = "any"
HealthUnknown = "unknown"
HealthPassing = "passing" HealthPassing = "passing"
HealthWarning = "warning" HealthWarning = "warning"
HealthCritical = "critical" HealthCritical = "critical"
@ -122,7 +121,6 @@ func (h *Health) State(state string, q *QueryOptions) ([]*HealthCheck, *QueryMet
case HealthWarning: case HealthWarning:
case HealthCritical: case HealthCritical:
case HealthPassing: case HealthPassing:
case HealthUnknown:
default: default:
return nil, nil, fmt.Errorf("Unsupported state: %v", state) return nil, nil, fmt.Errorf("Unsupported state: %v", state)
} }

21
command/agent/dns_test.go
View File

@ -1744,27 +1744,6 @@ func TestDNS_ServiceLookup_OnlyPassing(t *testing.T) {
if err := srv.agent.RPC("Catalog.Register", args3, &out); err != nil { if err := srv.agent.RPC("Catalog.Register", args3, &out); err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
args4 := &structs.RegisterRequest{
Datacenter: "dc1",
Node: "quux",
Address: "127.0.0.4",
Service: &structs.NodeService{
Service: "db",
Tags: []string{"master"},
Port: 12345,
},
Check: &structs.HealthCheck{
CheckID: "db",
Name: "db",
ServiceID: "db",
Status: structs.HealthUnknown,
},
}
if err := srv.agent.RPC("Catalog.Register", args4, &out); err != nil {
t.Fatalf("err: %v", err)
}
} }
// Register an equivalent prepared query. // Register an equivalent prepared query.

1
consul/structs/structs.go
View File

@ -53,7 +53,6 @@ const (
// HealthAny is special, and is used as a wild card, // HealthAny is special, and is used as a wild card,
// not as a specific state. // not as a specific state.
HealthAny = "any" HealthAny = "any"
HealthUnknown = "unknown"
HealthPassing = "passing" HealthPassing = "passing"
HealthWarning = "warning" HealthWarning = "warning"
HealthCritical = "critical" HealthCritical = "critical"