Merge pull request prometheus#2049 from prometheus/ctxfn-error

Update common/route vendoring for contextFn errors
sman591 · Oct 3, 2016 · f07e676 · f07e676
2 parents c0889fd + 4f79072
commit f07e676
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/vendor/github.com/prometheus/common/route/route.go b/vendor/github.com/prometheus/common/route/route.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -211,8 +211,8 @@
 		{
 			"checksumSHA1": "CKVJRc1NREmfoAWQLHxqWQlvxo0=",
 			"path": "github.com/prometheus/common/route",
-			"revision": "ee21c31a8cbad2a29cce94a8c53855e1dab92bf7",
-			"revisionTime": "2016-09-21T02:27:24+02:00"
+			"revision": "a85e6c850a142b95b63f9dd0ffd9645e5e437da7",
+			"revisionTime": "2016-10-02T22:56:21+02:00"
 		},
 		{
 			"checksumSHA1": "91KYK0SpvkaMJJA2+BcxbVnyRO0=",

diff --git a/web/web.go b/web/web.go
@@ -120,8 +120,8 @@ type Options struct {
 
 // New initializes a new web Handler.
 func New(o *Options) *Handler {
-	router := route.New(func(r *http.Request) context.Context {
-		return o.Context
+	router := route.New(func(r *http.Request) (context.Context, error) {
+		return o.Context, nil
 	})
 
 	h := &Handler{