go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more fine-grained log level

Browse Source
This commit is contained in:
ginuerzh
2022-08-18 11:34:57 +08:00
parent 052b8e9468
commit f3f3acd4e1
57 changed files with 262 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
listener/http2/h2/listener.go
View File

@ -131,9 +131,9 @@ func (l *h2Listener) Close() (err error) {
}
func (l *h2Listener) handleFunc(w http.ResponseWriter, r *http.Request) {
if l.logger.IsLevelEnabled(logger.DebugLevel) {
if l.logger.IsLevelEnabled(logger.TraceLevel) {
dump, _ := httputil.DumpRequest(r, false)
l.logger.Debug(string(dump))
l.logger.Trace(string(dump))
}
conn, err := l.upgrade(w, r)
if err != nil {

4
listener/mws/listener.go
View File

@ -135,13 +135,13 @@ func (l *mwsListener) Addr() net.Addr {
}
func (l *mwsListener) upgrade(w http.ResponseWriter, r *http.Request) {
if l.logger.IsLevelEnabled(logger.DebugLevel) {
if l.logger.IsLevelEnabled(logger.TraceLevel) {
log := l.logger.WithFields(map[string]any{
"local": l.addr.String(),
"remote": r.RemoteAddr,
})
dump, _ := httputil.DumpRequest(r, false)
log.Debug(string(dump))
log.Trace(string(dump))
}
conn, err := l.upgrader.Upgrade(w, r, l.md.header)

12
listener/obfs/http/conn.go
View File

@ -49,9 +49,9 @@ func (c *obfsHTTPConn) handshake() (err error) {
return
}
if c.logger.IsLevelEnabled(logger.DebugLevel) {
if c.logger.IsLevelEnabled(logger.TraceLevel) {
dump, _ := httputil.DumpRequest(r, false)
c.logger.Debug(string(dump))
c.logger.Trace(string(dump))
}
if r.ContentLength > 0 {
@ -82,9 +82,9 @@ func (c *obfsHTTPConn) handshake() (err error) {
if r.Method != http.MethodGet || r.Header.Get("Upgrade") != "websocket" {
resp.StatusCode = http.StatusBadRequest
if c.logger.IsLevelEnabled(logger.DebugLevel) {
if c.logger.IsLevelEnabled(logger.TraceLevel) {
dump, _ := httputil.DumpResponse(&resp, false)
c.logger.Debug(string(dump))
c.logger.Trace(string(dump))
}
resp.Write(c.Conn)
@ -96,9 +96,9 @@ func (c *obfsHTTPConn) handshake() (err error) {
resp.Header.Set("Upgrade", "websocket")
resp.Header.Set("Sec-WebSocket-Accept", c.computeAcceptKey(r.Header.Get("Sec-WebSocket-Key")))
if c.logger.IsLevelEnabled(logger.DebugLevel) {
if c.logger.IsLevelEnabled(logger.TraceLevel) {
dump, _ := httputil.DumpResponse(&resp, false)
c.logger.Debug(string(dump))
c.logger.Trace(string(dump))
}
if c.rbuf.Len() > 0 {

2
listener/sshd/listener.go
View File

@ -142,7 +142,7 @@ func (l *sshdListener) serveConn(conn net.Conn) {
p := directForward{}
ssh.Unmarshal(newChannel.ExtraData(), &p)
l.logger.Debug(p.String())
l.logger.Trace(p.String())
if p.Host1 == "<nil>" {
p.Host1 = ""

4
listener/ws/listener.go
View File

@ -130,13 +130,13 @@ func (l *wsListener) Addr() net.Addr {
}
func (l *wsListener) upgrade(w http.ResponseWriter, r *http.Request) {
if l.logger.IsLevelEnabled(logger.DebugLevel) {
if l.logger.IsLevelEnabled(logger.TraceLevel) {
log := l.logger.WithFields(map[string]any{
"local": l.addr.String(),
"remote": r.RemoteAddr,
})
dump, _ := httputil.DumpRequest(r, false)
log.Debug(string(dump))
log.Trace(string(dump))
}
conn, err := l.upgrader.Upgrade(w, r, l.md.header)