mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix for response body and linting

Browse source
This commit is contained in:
Kegan Dougal 2020-04-15 15:05:04 +01:00
parent c76d271c6f
commit b82ca6555c
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/httpapi.go
View file

@ -56,12 +56,13 @@ func MakeExternalAPI(metricsName string, f func(*http.Request) util.JSONResponse
if verbose { if verbose {
logger := logrus.NewEntry(logrus.StandardLogger()) logger := logrus.NewEntry(logrus.StandardLogger())
// Log outgoing response // Log outgoing response
nextWriter := httptest.NewRecorder() rec := httptest.NewRecorder()
nextWriter = rec
defer func() { defer func() {
resp := nextWriter.Result() resp := rec.Result()
dump, err := httputil.DumpResponse(resp, true) dump, err := httputil.DumpResponse(resp, true)
if err != nil { if err != nil {
logger.Debug("Failed to dump outgoing response: %s", err) logger.Debugf("Failed to dump outgoing response: %s", err)
} else { } else {
strSlice := strings.Split(string(dump), "\n") strSlice := strings.Split(string(dump), "\n")
for _, s := range strSlice { for _, s := range strSlice {
@ -82,7 +83,7 @@ func MakeExternalAPI(metricsName string, f func(*http.Request) util.JSONResponse
// Log incoming request // Log incoming request
dump, err := httputil.DumpRequest(req, true) dump, err := httputil.DumpRequest(req, true)
if err != nil { if err != nil {
logger.Debug("Failed to dump incoming request: %s", err) logger.Debugf("Failed to dump incoming request: %s", err)
} else { } else {
strSlice := strings.Split(string(dump), "\n") strSlice := strings.Split(string(dump), "\n")
for _, s := range strSlice { for _, s := range strSlice {