feed through context

Stebalien · Stebalien · commit 7b75a8c57798 · 2019-04-04T00:37:23.000-07:00
see ipfs/go-ipfs-api#173 all credit to @optman
diff --git a/request.go b/request.go
@@ -7,6 +7,7 @@ import (
 )
 
 type Request struct {
+	Ctx     context.Context
 	ApiBase string
 	Command string
 	Args    []string
@@ -25,6 +26,7 @@ func NewRequest(ctx context.Context, url, command string, args ...string) *Reque
 		"stream-channels": "true",
 	}
 	return &Request{
+		Ctx:     ctx,
 		ApiBase: url + "/api/v0",
 		Command: command,
 		Args:    args,
diff --git a/response.go b/response.go
@@ -95,6 +95,8 @@ func (r *Request) Send(c *http.Client) (*Response, error) {
 		return nil, err
 	}
 
+	req = req.WithContext(r.Ctx)
+
 	// Add any headers that were supplied via the RequestBuilder.
 	for k, v := range r.Headers {
 		req.Header.Add(k, v)

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type Request struct {`
	`10`	`+ Ctx context.Context`
`10`	`11`	`ApiBase string`
`11`	`12`	`Command string`
`12`	`13`	`Args []string`
`@@ -25,6 +26,7 @@ func NewRequest(ctx context.Context, url, command string, args ...string) *Reque`
`25`	`26`	`"stream-channels": "true",`
`26`	`27`	`}`
`27`	`28`	`return &Request{`
	`29`	`+ Ctx: ctx,`
`28`	`30`	`ApiBase: url + "/api/v0",`
`29`	`31`	`Command: command,`
`30`	`32`	`Args: args,`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ func (r Request) Send(c http.Client) (*Response, error) {`
`95`	`95`	`return nil, err`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ req = req.WithContext(r.Ctx)`
	`99`	`+`
`98`	`100`	`// Add any headers that were supplied via the RequestBuilder.`
`99`	`101`	`for k, v := range r.Headers {`
`100`	`102`	`req.Header.Add(k, v)`