Merge pull request #268 from mickeyreiss/fix-call-error-context

Update context from callError
twitchtv · Sep 13, 2020 · db097af · db097af
2 parents 551952a + 14a1a2a
commit db097af
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/protoc-gen-twirp/generator.go b/protoc-gen-twirp/generator.go
@@ -1241,7 +1241,7 @@ func (t *twirp) generateServerJSONMethod(service *descriptor.ServiceDescriptorPr
 	t.P(`  if n, err := resp.Write(respBytes); err != nil {`)
 	t.P(`    msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())`)
 	t.P(`    twerr := `, t.pkgs["twirp"], `.NewError(`, t.pkgs["twirp"], `.Unknown, msg)`)
-	t.P(`    callError(ctx, s.hooks, twerr)`)
+	t.P(`    ctx = callError(ctx, s.hooks, twerr)`)
 	t.P(`  }`)
 	t.P(`  callResponseSent(ctx, s.hooks)`)
 	t.P(`}`)
@@ -1303,7 +1303,7 @@ func (t *twirp) generateServerProtobufMethod(service *descriptor.ServiceDescript
 	t.P(`  if n, err := resp.Write(respBytes); err != nil {`)
 	t.P(`    msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())`)
 	t.P(`    twerr := `, t.pkgs["twirp"], `.NewError(`, t.pkgs["twirp"], `.Unknown, msg)`)
-	t.P(`    callError(ctx, s.hooks, twerr)`)
+	t.P(`    ctx = callError(ctx, s.hooks, twerr)`)
 	t.P(`  }`)
 	t.P(`  callResponseSent(ctx, s.hooks)`)
 	t.P(`}`)