mirror of
https://github.com/rclone/rclone
synced 2024-11-23 00:06:55 +01:00
8057d668bb
A nil-pointer exception was caused if the http transaction ever resulted in a go error while using `--dump-bodies`. Now don't ignore the error and log it instead of the http body.
62 lines
1.6 KiB
Go
62 lines
1.6 KiB
Go
// A logging http transport
|
|
|
|
package fs
|
|
|
|
import (
|
|
"log"
|
|
"net/http"
|
|
"net/http/httputil"
|
|
)
|
|
|
|
const (
|
|
separatorReq = ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
|
|
separatorResp = "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
|
|
)
|
|
|
|
// LoggedTransport is an http transport which logs the traffic
|
|
type LoggedTransport struct {
|
|
wrapped http.RoundTripper
|
|
logBody bool
|
|
}
|
|
|
|
// NewLoggedTransport wraps the transport passed in and logs all roundtrips
|
|
// including the body if logBody is set.
|
|
func NewLoggedTransport(transport http.RoundTripper, logBody bool) *LoggedTransport {
|
|
return &LoggedTransport{
|
|
wrapped: transport,
|
|
logBody: logBody,
|
|
}
|
|
}
|
|
|
|
// CancelRequest cancels an in-flight request by closing its
|
|
// connection. CancelRequest should only be called after RoundTrip has
|
|
// returned.
|
|
func (t *LoggedTransport) CancelRequest(req *http.Request) {
|
|
if wrapped, ok := t.wrapped.(interface {
|
|
CancelRequest(*http.Request)
|
|
}); ok {
|
|
log.Printf("CANCEL REQUEST %v", req)
|
|
wrapped.CancelRequest(req)
|
|
}
|
|
}
|
|
|
|
// RoundTrip implements the RoundTripper interface.
|
|
func (t *LoggedTransport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
|
|
buf, _ := httputil.DumpRequestOut(req, t.logBody)
|
|
log.Println(separatorReq)
|
|
log.Println("HTTP REQUEST")
|
|
log.Println(string(buf))
|
|
log.Println(separatorReq)
|
|
resp, err = t.wrapped.RoundTrip(req)
|
|
log.Println(separatorResp)
|
|
log.Println("HTTP RESPONSE")
|
|
if err != nil {
|
|
log.Printf("Error: %v\n", err)
|
|
} else {
|
|
buf, _ = httputil.DumpResponse(resp, t.logBody)
|
|
log.Println(string(buf))
|
|
}
|
|
log.Println(separatorResp)
|
|
return resp, err
|
|
}
|