prometheus/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager.git synced 2026-02-05 15:45:34 +01:00
Code Issues Releases Activity

Return from errors earlier

Browse Source 
Signed-off-by: Ben Ridley <benridley29@gmail.com>
This commit is contained in:
Ben Ridley
2020-11-24 14:12:13 +11:00
parent 11b643dd23
commit 1cc736c4c8
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
timeinterval/timeinterval.go
View File

@@ -168,7 +168,9 @@ func (r *WeekdayRange) UnmarshalYAML(unmarshal func(interface{}) error) error {
if err := unmarshal(&str); err != nil {
return err
}
err := stringableRangeFromString(str, r)
if err := stringableRangeFromString(str, r); err != nil {
return err
}
if r.Begin > r.End {
return errors.New("start day cannot be before end day")
}
@@ -178,7 +180,7 @@ func (r *WeekdayRange) UnmarshalYAML(unmarshal func(interface{}) error) error {
if r.End < 0 || r.End > 6 {
return fmt.Errorf("%s is not a valid day of the week: out of range", str)
}
return err
return nil
}
// UnmarshalYAML implements the Unmarshaller interface for DayOfMonthRange.
@@ -187,7 +189,9 @@ func (r *DayOfMonthRange) UnmarshalYAML(unmarshal func(interface{}) error) error
if err := unmarshal(&str); err != nil {
return err
}
err := stringableRangeFromString(str, r)
if err := stringableRangeFromString(str, r); err != nil {
return err
}
// Check beginning <= end accounting for negatives day of month indices as well.
// Months != 31 days can't be addressed here and are clamped, but at least we can catch blatant errors.
if r.Begin == 0 || r.Begin < -31 || r.Begin > 31 {
@@ -213,7 +217,7 @@ func (r *DayOfMonthRange) UnmarshalYAML(unmarshal func(interface{}) error) error
if checkBegin > checkEnd {
return fmt.Errorf("end day %d is always before start day %d", r.End, r.Begin)
}
return err
return nil
}
// UnmarshalYAML implements the Unmarshaller interface for MonthRange.
@@ -239,11 +243,13 @@ func (r *YearRange) UnmarshalYAML(unmarshal func(interface{}) error) error {
if err := unmarshal(&str); err != nil {
return err
}
err := stringableRangeFromString(str, r)
if err := stringableRangeFromString(str, r); err != nil {
return err
}
if r.Begin > r.End {
return fmt.Errorf("end year %d is before start year %d", r.End, r.Begin)
}
return err
return nil
}
// UnmarshalYAML implements the Unmarshaller interface for TimeRanges.