faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-22 06:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't buffer body / response into memory

Browse Source 
Signed-off-by: Alex Ellis <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis
2017-11-11 12:10:33 +00:00
parent d929ec191a
commit fb1b35b6eb
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gateway/handlers/proxy.go
View File

@ -7,7 +7,7 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"io/ioutil" "io"
"math/rand" "math/rand"
"net" "net"
"net/http" "net/http"
@ -94,8 +94,7 @@ func lookupInvoke(w http.ResponseWriter, r *http.Request, metrics metrics.Metric
defer trackTime(time.Now(), metrics, name) defer trackTime(time.Now(), metrics, name)
forwardReq := requests.NewForwardRequest(r.Method, *r.URL) forwardReq := requests.NewForwardRequest(r.Method, *r.URL)
requestBody, _ := ioutil.ReadAll(r.Body) invokeService(w, r, metrics, name, forwardReq, logger, proxyClient)
invokeService(w, r, metrics, name, forwardReq, requestBody, logger, proxyClient)
} }
} }
@ -108,7 +107,7 @@ func lookupSwarmService(serviceName string, c *client.Client) (bool, error) {
return len(services) > 0, err return len(services) > 0, err
} }
func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.MetricOptions, service string, forwardReq requests.ForwardRequest, requestBody []byte, logger *logrus.Logger, proxyClient *http.Client) { func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.MetricOptions, service string, forwardReq requests.ForwardRequest, logger *logrus.Logger, proxyClient *http.Client) {
stamp := strconv.FormatInt(time.Now().Unix(), 10) stamp := strconv.FormatInt(time.Now().Unix(), 10)
defer func(when time.Time) { defer func(when time.Time) {
@ -141,12 +140,14 @@ func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.Metri
contentType := r.Header.Get("Content-Type") contentType := r.Header.Get("Content-Type")
fmt.Printf("[%s] Forwarding request [%s] to: %s\n", stamp, contentType, url) fmt.Printf("[%s] Forwarding request [%s] to: %s\n", stamp, contentType, url)
request, err := http.NewRequest(r.Method, url, bytes.NewReader(requestBody)) if r.Body != nil {
defer r.Body.Close()
}
request, err := http.NewRequest(r.Method, url, r.Body)
copyHeaders(&request.Header, &r.Header) copyHeaders(&request.Header, &r.Header)
defer request.Body.Close()
response, err := proxyClient.Do(request) response, err := proxyClient.Do(request)
if err != nil { if err != nil {
logger.Infoln(err) logger.Infoln(err)
@ -156,16 +157,6 @@ func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.Metri
return return
} }
responseBody, readErr := ioutil.ReadAll(response.Body)
if readErr != nil {
fmt.Println(readErr)
writeHead(service, metrics, http.StatusInternalServerError, w)
buf := bytes.NewBufferString("Error reading response from service: " + service)
w.Write(buf.Bytes())
return
}
clientHeader := w.Header() clientHeader := w.Header()
copyHeaders(&clientHeader, &response.Header) copyHeaders(&clientHeader, &response.Header)
@ -174,7 +165,9 @@ func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.Metri
w.Header().Set("Content-Type", GetContentType(response.Header, r.Header, defaultHeader)) w.Header().Set("Content-Type", GetContentType(response.Header, r.Header, defaultHeader))
writeHead(service, metrics, response.StatusCode, w) writeHead(service, metrics, response.StatusCode, w)
w.Write(responseBody) if response.Body != nil {
io.Copy(w, response.Body)
}
} }
// GetContentType resolves the correct Content-Tyoe for a proxied function // GetContentType resolves the correct Content-Tyoe for a proxied function