luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

grace_period -> grace

This commit is contained in:
Michael Schurter 2017-09-26 10:21:35 -07:00
parent 68e679a8f2
commit d0140f07ca
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/tasks.go
View File

@ -83,7 +83,7 @@ func (r *RestartPolicy) Merge(rp *RestartPolicy) {
// failing health checks. // failing health checks.
type CheckRestart struct { type CheckRestart struct {
Limit int `mapstructure:"limit"` Limit int `mapstructure:"limit"`
Grace *time.Duration `mapstructure:"grace_period"` Grace *time.Duration `mapstructure:"grace"`
IgnoreWarnings bool `mapstructure:"ignore_warnings"` IgnoreWarnings bool `mapstructure:"ignore_warnings"`
} }

2
jobspec/parse.go
View File

@ -1062,7 +1062,7 @@ func parseChecks(service *api.Service, checkObjs *ast.ObjectList) error {
func parseCheckRestart(cro *ast.ObjectItem) (*api.CheckRestart, error) { func parseCheckRestart(cro *ast.ObjectItem) (*api.CheckRestart, error) {
valid := []string{ valid := []string{
"limit", "limit",
"grace_period", "grace",
"ignore_warnings", "ignore_warnings",
} }

2
jobspec/test-fixtures/basic.hcl
View File

@ -98,7 +98,7 @@ job "binstore-storagelocker" {
check_restart { check_restart {
limit = 3 limit = 3
grace_period = "10s" grace = "10s"
ignore_warnings = true ignore_warnings = true
} }
} }