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

Upon further review, the Timeout needs to be validate for more than script checks.

Browse Source 
This value is used for Consul HTTP and TCP checks.
This commit is contained in:
Sean Chittenden
2016-06-13 18:28:27 -07:00
parent e43d991781
commit 18ef97bf4e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nomad/structs/structs.go
View File

@@ -1530,10 +1530,6 @@ func (sc *ServiceCheck) validate() error {
if sc.Command == "" {
return fmt.Errorf("script type must have a valid script path")
}
if sc.Timeout <= minCheckTimeout {
return fmt.Errorf("timeout %v is lower than required minimum timeout %v", sc.Timeout, minCheckInterval)
}
default:
return fmt.Errorf(`invalid type (%+q), must be one of "http", "tcp", or "script" type`, sc.Type)
}
@@ -1541,6 +1537,11 @@ func (sc *ServiceCheck) validate() error {
if sc.Interval <= minCheckInterval {
return fmt.Errorf("interval (%v) can not be lower than %v", sc.Interval, minCheckInterval)
}
if sc.Timeout <= minCheckTimeout {
return fmt.Errorf("timeout %v is lower than required minimum timeout %v", sc.Timeout, minCheckInterval)
}
return nil
}