From 183be62f2a2882c229dc00427a9dc09c23fb8319 Mon Sep 17 00:00:00 2001
From: Fabian Reinartz <fab.reinartz@gmail.com>
Date: Thu, 4 Jun 2015 12:02:26 +0200
Subject: [PATCH] util/strutil: do not panic on wrong duration unit.

---
 util/strutil/strconv.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/strutil/strconv.go b/util/strutil/strconv.go
index 99b1e48a5..43d42633e 100644
--- a/util/strutil/strconv.go
+++ b/util/strutil/strconv.go
@@ -78,7 +78,7 @@ func StringToDuration(durationStr string) (duration time.Duration, err error) {
 	case "s":
 		duration *= 1
 	default:
-		panic("Invalid time unit in duration string.")
+		return 0, fmt.Errorf("invalid time unit in duration string: %q", unit)
 	}
 	return
 }