Merge branch 'master' into kd-live

This commit is contained in:
2023-06-27 20:05:32 +09:00

View File

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
"net/url"
"os" "os"
"path" "path"
"reflect" "reflect"
@ -109,29 +108,6 @@ func (h *houstonHandler) RegisterHandlers(serveMux *http.ServeMux, prefix string
var noauth = flagx.Bool("noauth", false, "") var noauth = flagx.Bool("noauth", false, "")
type respWriteTracker struct {
inner http.ResponseWriter
reqUrlValues url.Values
body []byte
}
func (rt *respWriteTracker) Header() http.Header {
return rt.inner.Header()
}
func (rt *respWriteTracker) Write(bt []byte) (int, error) {
rt.body = append(rt.body, bt...)
return rt.inner.Write(bt)
}
func (rt *respWriteTracker) WriteHeader(statusCode int) {
if statusCode != http.StatusOK {
logger.Println()
}
}
var logApiCallFlag = flagx.Bool("logapicall", false, "")
func (h *houstonHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (h *houstonHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
defer func() { defer func() {
s := recover() s := recover()
@ -198,27 +174,6 @@ func (h *houstonHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
if *logApiCallFlag {
var urlvalues url.Values
if r.Method == "POST" {
urlvalues = r.Form
} else {
urlvalues = r.URL.Query()
}
tracker := &respWriteTracker{
inner: w,
reqUrlValues: urlvalues,
}
defer func() {
logger.Println("api called :", userinfo["email"], urlvalues)
logger.Println("-->", string(tracker.body))
}()
w = http.ResponseWriter(tracker)
}
args := []reflect.Value{ args := []reflect.Value{
reflect.ValueOf(h), reflect.ValueOf(h),
reflect.ValueOf(w), reflect.ValueOf(w),