Skip to content
This repository was archived by the owner on Dec 5, 2023. It is now read-only.

Commit e147999

Browse files
author
Phil Winder
authored
Merge pull request #44 from microservices-demo/refactor/remove-hystrix
Remove hystrix circuit-breaking code to avoid 500's.
2 parents ed60362 + 5e0e4d5 commit e147999

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

api/transport.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"net/http"
1010
"strings"
1111

12-
"github.com/go-kit/kit/circuitbreaker"
1312
"github.com/go-kit/kit/log"
1413
"github.com/go-kit/kit/tracing/opentracing"
1514
httptransport "github.com/go-kit/kit/transport/http"
@@ -38,70 +37,70 @@ func MakeHTTPHandler(ctx context.Context, e Endpoints, logger log.Logger, tracer
3837

3938
r.Methods("GET").Path("/login").Handler(httptransport.NewServer(
4039
ctx,
41-
circuitbreaker.Hystrix("Login")(e.LoginEndpoint),
40+
e.LoginEndpoint,
4241
decodeLoginRequest,
4342
encodeResponse,
4443
append(options, httptransport.ServerBefore(opentracing.FromHTTPRequest(tracer, "GET /login", logger)))...,
4544
))
4645
r.Methods("POST").Path("/register").Handler(httptransport.NewServer(
4746
ctx,
48-
circuitbreaker.Hystrix("Register")(e.RegisterEndpoint),
47+
e.RegisterEndpoint,
4948
decodeRegisterRequest,
5049
encodeResponse,
5150
append(options, httptransport.ServerBefore(opentracing.FromHTTPRequest(tracer, "POST /register", logger)))...,
5251
))
5352
r.Methods("GET").PathPrefix("/customers").Handler(httptransport.NewServer(
5453
ctx,
55-
circuitbreaker.Hystrix("UserGet")(e.UserGetEndpoint),
54+
e.UserGetEndpoint,
5655
decodeGetRequest,
5756
encodeResponse,
5857
append(options, httptransport.ServerBefore(opentracing.FromHTTPRequest(tracer, "GET /customers", logger)))...,
5958
))
6059
r.Methods("GET").PathPrefix("/cards").Handler(httptransport.NewServer(
6160
ctx,
62-
circuitbreaker.Hystrix("CardGet")(e.CardGetEndpoint),
61+
e.CardGetEndpoint,
6362
decodeGetRequest,
6463
encodeResponse,
6564
append(options, httptransport.ServerBefore(opentracing.FromHTTPRequest(tracer, "GET /cards", logger)))...,
6665
))
6766
r.Methods("GET").PathPrefix("/addresses").Handler(httptransport.NewServer(
6867
ctx,
69-
circuitbreaker.Hystrix("AddressGet")(e.AddressGetEndpoint),
68+
e.AddressGetEndpoint,
7069
decodeGetRequest,
7170
encodeResponse,
7271
append(options, httptransport.ServerBefore(opentracing.FromHTTPRequest(tracer, "GET /addresses", logger)))...,
7372
))
7473
r.Methods("POST").Path("/customers").Handler(httptransport.NewServer(
7574
ctx,
76-
circuitbreaker.Hystrix("UserPost")(e.UserPostEndpoint),
75+
e.UserPostEndpoint,
7776
decodeUserRequest,
7877
encodeResponse,
7978
append(options, httptransport.ServerBefore(opentracing.FromHTTPRequest(tracer, "POST /customers", logger)))...,
8079
))
8180
r.Methods("POST").Path("/addresses").Handler(httptransport.NewServer(
8281
ctx,
83-
circuitbreaker.Hystrix("AddressPost")(e.AddressPostEndpoint),
82+
e.AddressPostEndpoint,
8483
decodeAddressRequest,
8584
encodeResponse,
8685
append(options, httptransport.ServerBefore(opentracing.FromHTTPRequest(tracer, "POST /addresses", logger)))...,
8786
))
8887
r.Methods("POST").Path("/cards").Handler(httptransport.NewServer(
8988
ctx,
90-
circuitbreaker.Hystrix("CardPost")(e.CardPostEndpoint),
89+
e.CardPostEndpoint,
9190
decodeCardRequest,
9291
encodeResponse,
9392
append(options, httptransport.ServerBefore(opentracing.FromHTTPRequest(tracer, "POST /cards", logger)))...,
9493
))
9594
r.Methods("DELETE").PathPrefix("/").Handler(httptransport.NewServer(
9695
ctx,
97-
circuitbreaker.Hystrix("Delete")(e.DeleteEndpoint),
96+
e.DeleteEndpoint,
9897
decodeDeleteRequest,
9998
encodeResponse,
10099
append(options, httptransport.ServerBefore(opentracing.FromHTTPRequest(tracer, "DELETE /", logger)))...,
101100
))
102101
r.Methods("GET").PathPrefix("/health").Handler(httptransport.NewServer(
103102
ctx,
104-
circuitbreaker.Hystrix("Health")(e.HealthEndpoint),
103+
e.HealthEndpoint,
105104
decodeHealthRequest,
106105
encodeHealthResponse,
107106
append(options, httptransport.ServerBefore(opentracing.FromHTTPRequest(tracer, "GET /health", logger)))...,

0 commit comments

Comments
 (0)