mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-24 05:04:05 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #772 from prometheus/fabxc/dur-panic

Browse source 
util/strutil: do not panic on wrong duration unit.
This commit is contained in:
Fabian Reinartz 2015-06-05 12:42:30 +02:00
parent f344ecba59 183be62f2a
commit 7943aa834c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
util/strutil/strconv.go
View file

@ -78,7 +78,7 @@ func StringToDuration(durationStr string) (duration time.Duration, err error) {
case "s": case "s":
duration *= 1 duration *= 1
default: default:
panic("Invalid time unit in duration string.") return 0, fmt.Errorf("invalid time unit in duration string: %q", unit)
} }
return return
} }