projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14345: Use "." placeholder to persist empty directories.
[arvados.git]
/
lib
/
controller
/
proxy.go
diff --git
a/lib/controller/proxy.go
b/lib/controller/proxy.go
index c89b9b36ae0cddfc67a127d1e6f8bdac84ab6412..c01c152352e6b8f101179bf38add3b0574a00c5d 100644
(file)
--- a/
lib/controller/proxy.go
+++ b/
lib/controller/proxy.go
@@
-5,18
+5,15
@@
package controller
import (
package controller
import (
- "context"
"io"
"net/http"
"net/url"
"io"
"net/http"
"net/url"
- "time"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
)
type proxy struct {
"git.curoverse.com/arvados.git/sdk/go/httpserver"
)
type proxy struct {
- Name string // to use in Via header
- RequestTimeout time.Duration
+ Name string // to use in Via header
}
type HTTPError struct {
}
type HTTPError struct {
@@
-49,7
+46,7
@@
type ResponseFilter func(*http.Response, error) (*http.Response, error)
func (p *proxy) Do(
reqIn *http.Request,
urlOut *url.URL,
func (p *proxy) Do(
reqIn *http.Request,
urlOut *url.URL,
- client *http.Client) (*http.Response,
context.CancelFunc,
error) {
+ client *http.Client) (*http.Response, error) {
// Copy headers from incoming request, then add/replace proxy
// headers like Via and X-Forwarded-For.
// Copy headers from incoming request, then add/replace proxy
// headers like Via and X-Forwarded-For.
@@
-69,22
+66,16
@@
func (p *proxy) Do(
}
hdrOut.Add("Via", reqIn.Proto+" arvados-controller")
}
hdrOut.Add("Via", reqIn.Proto+" arvados-controller")
- ctx := reqIn.Context()
- var cancel context.CancelFunc
- if p.RequestTimeout > 0 {
- ctx, cancel = context.WithDeadline(ctx, time.Now().Add(time.Duration(p.RequestTimeout)))
- }
-
reqOut := (&http.Request{
Method: reqIn.Method,
URL: urlOut,
Host: reqIn.Host,
Header: hdrOut,
Body: reqIn.Body,
reqOut := (&http.Request{
Method: reqIn.Method,
URL: urlOut,
Host: reqIn.Host,
Header: hdrOut,
Body: reqIn.Body,
- }).WithContext(
ctx
)
+ }).WithContext(
reqIn.Context()
)
resp, err := client.Do(reqOut)
resp, err := client.Do(reqOut)
- return resp,
cancel,
err
+ return resp, err
}
// Copy a response (or error) to the downstream client
}
// Copy a response (or error) to the downstream client