mirror of
https://github.com/go-kit/kit.git
synced 2026-04-26 20:41:58 +02:00
examples: stringsvc should properly return errors
The error type doesn't JSON marshal. Fixes #121.
This commit is contained in:
+6
-3
@@ -75,7 +75,7 @@ type uppercaseRequest struct {
|
||||
|
||||
type uppercaseResponse struct {
|
||||
V string `json:"v"`
|
||||
Err error `json:"err"`
|
||||
Err string `json:"err"` // errors don't define JSON marshaling
|
||||
}
|
||||
|
||||
type countRequest struct {
|
||||
@@ -109,7 +109,7 @@ func makeUppercaseEndpoint(svc StringService) endpoint.Endpoint {
|
||||
return func(ctx context.Context, request interface{}) (interface{}, error) {
|
||||
req := request.(uppercaseRequest)
|
||||
v, err := svc.Uppercase(req.S)
|
||||
return uppercaseResponse{v, err}, nil
|
||||
return uppercaseResponse{v, err.Error()}, nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -483,7 +483,10 @@ func (mw proxymw) Uppercase(s string) (string, error) {
|
||||
return "", err
|
||||
}
|
||||
resp := response.(uppercaseResponse)
|
||||
return resp.V, resp.Err
|
||||
if resp.Err != "" {
|
||||
return resp.V, errors.New(resp.Err)
|
||||
}
|
||||
return resp.V, nil
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ func makeUppercaseEndpoint(svc StringService) endpoint.Endpoint {
|
||||
return func(ctx context.Context, request interface{}) (interface{}, error) {
|
||||
req := request.(uppercaseRequest)
|
||||
v, err := svc.Uppercase(req.S)
|
||||
return uppercaseResponse{v, err}, nil
|
||||
return uppercaseResponse{v, err.Error()}, nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ type uppercaseRequest struct {
|
||||
|
||||
type uppercaseResponse struct {
|
||||
V string `json:"v"`
|
||||
Err error `json:"err"`
|
||||
Err string `json:"err"` // errors don't define JSON marshaling
|
||||
}
|
||||
|
||||
type countRequest struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ func makeUppercaseEndpoint(svc StringService) endpoint.Endpoint {
|
||||
return func(ctx context.Context, request interface{}) (interface{}, error) {
|
||||
req := request.(uppercaseRequest)
|
||||
v, err := svc.Uppercase(req.S)
|
||||
return uppercaseResponse{v, err}, nil
|
||||
return uppercaseResponse{v, err.Error()}, nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ type uppercaseRequest struct {
|
||||
|
||||
type uppercaseResponse struct {
|
||||
V string `json:"v"`
|
||||
Err error `json:"err"`
|
||||
Err string `json:"err"`
|
||||
}
|
||||
|
||||
type countRequest struct {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
@@ -57,7 +58,10 @@ func (mw proxymw) Uppercase(s string) (string, error) {
|
||||
}
|
||||
|
||||
resp := response.(uppercaseResponse)
|
||||
return resp.V, resp.Err
|
||||
if resp.Err != "" {
|
||||
return resp.V, errors.New(resp.Err)
|
||||
}
|
||||
return resp.V, nil
|
||||
}
|
||||
|
||||
func factory(ctx context.Context, qps int) loadbalancer.Factory {
|
||||
|
||||
@@ -15,7 +15,7 @@ func makeUppercaseEndpoint(svc StringService) endpoint.Endpoint {
|
||||
return func(ctx context.Context, request interface{}) (interface{}, error) {
|
||||
req := request.(uppercaseRequest)
|
||||
v, err := svc.Uppercase(req.S)
|
||||
return uppercaseResponse{v, err}, nil
|
||||
return uppercaseResponse{v, err.Error()}, nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ type uppercaseRequest struct {
|
||||
|
||||
type uppercaseResponse struct {
|
||||
V string `json:"v"`
|
||||
Err error `json:"err"`
|
||||
Err string `json:"err"`
|
||||
}
|
||||
|
||||
type countRequest struct {
|
||||
|
||||
Reference in New Issue
Block a user