Merge 4932af0 into e670e4d

uber · Nov 2, 2019 · 8131a1c · 8131a1c
2 parents e670e4d + 4932af0
commit 8131a1c
Show file tree

Hide file tree

Showing 11 changed files with 298 additions and 76 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/http_client.tmpl b/codegen/templates/http_client.tmpl
@@ -238,8 +238,11 @@ func (c *{{$clientName}}) {{$methodName}}(
 	if (c.circuitBreakerDisabled) {
 		res, err = req.Do()
 	} else {
-		err = hystrix.DoC(ctx, "{{$clientID}}", func(ctx context.Context) error {
+		hystrix.DoC(ctx, "{{$clientID}}", func(ctx context.Context) error {
 			res, err = req.Do()
+			if res.StatusCode < 500 {
+				return nil
+			}
 			return err
 		}, nil)
 	}

diff --git a/codegen/templates/tchannel_client.tmpl b/codegen/templates/tchannel_client.tmpl
@@ -264,10 +264,13 @@ type {{$clientName}} struct {
 				ctx, "{{$svc.Name}}", "{{.Name}}", reqHeaders, args, &result,
 			)
 		} else {
-			err = hystrix.DoC(ctx, "{{$clientID}}", func(ctx context.Context) error {
+			hystrix.DoC(ctx, "{{$clientID}}", func(ctx context.Context) error {
 				success, respHeaders, err = c.client.Call(
 					ctx, "{{$svc.Name}}", "{{.Name}}", reqHeaders, args, &result,
 				)
+				if _, isSysErr := err.(tchannel.SystemError); !isSysErr {
+					return nil
+				}
 				return err
 			}, nil)
 		}