fix request logs

This commit is contained in:
Jeff
2019-09-20 17:33:57 +08:00
committed by zryfish
parent 49dacd3e70
commit f85f6b6b58

View File

@@ -20,6 +20,7 @@ package filter
import (
"k8s.io/klog"
"net"
"strings"
"time"
@@ -30,7 +31,7 @@ func Logging(req *restful.Request, resp *restful.Response, chain *restful.Filter
start := time.Now()
chain.ProcessFilter(req, resp)
klog.V(4).Infof("%s - \"%s %s %s\" %d %d %dms",
strings.Split(req.Request.RemoteAddr, ":")[0],
getRequestIP(req),
req.Request.Method,
req.Request.RequestURI,
req.Request.Proto,
@@ -39,3 +40,22 @@ func Logging(req *restful.Request, resp *restful.Response, chain *restful.Filter
time.Since(start)/time.Millisecond,
)
}
func getRequestIP(req *restful.Request) string {
address := strings.Trim(req.Request.Header.Get("X-Real-Ip"), " ")
if address != "" {
return address
}
address = strings.Trim(req.Request.Header.Get("X-Forwarded-For"), " ")
if address != "" {
return address
}
address, _, err := net.SplitHostPort(req.Request.RemoteAddr)
if err != nil {
return req.Request.RemoteAddr
}
return address
}