mirror of
https://github.com/xjasonlyu/tun2socks.git
synced 2026-10-19 16:16:35 +00:00
Fix(log): set log level for glog (#511)
This commit is contained in:
@@ -168,7 +168,9 @@ jobs:
|
||||
exit 1
|
||||
|
||||
- name: Test TCP via HTTP
|
||||
run: docker exec "${APP_TUN2SOCKS}" curl -fsS -v --max-time 10 ipinfo.io
|
||||
run: |
|
||||
docker exec "${APP_TUN2SOCKS}" curl -fsS -v --max-time 10 -o /dev/null \
|
||||
http://connectivitycheck.gstatic.com/generate_204
|
||||
|
||||
- name: Test UDP via DNS
|
||||
if: ${{ matrix.udp }}
|
||||
|
||||
+2
-9
@@ -1,8 +1,6 @@
|
||||
package log
|
||||
|
||||
import (
|
||||
"runtime"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
glog "gvisor.dev/gvisor/pkg/log"
|
||||
@@ -20,18 +18,13 @@ type emitter struct {
|
||||
|
||||
func (e *emitter) setLogger(logger *SugaredLogger) {
|
||||
e.logger = logger.WithOptions(pkgCallerSkip)
|
||||
glog.SetLevel(1 - glog.Level(e.logger.Level()))
|
||||
}
|
||||
|
||||
func (e *emitter) logf(level glog.Level, format string, args ...any) {
|
||||
e.logger.Logf(1-Level(level), "[STACK] "+format, args...)
|
||||
}
|
||||
|
||||
func (e *emitter) Emit(depth int, level glog.Level, _ time.Time, format string, args ...any) {
|
||||
if _, file, line, ok := runtime.Caller(depth + 1); ok {
|
||||
// Ignore: gvisor.dev/gvisor/pkg/tcpip/adapters/gonet/gonet.go:457
|
||||
if line == 457 && strings.HasSuffix(file, "gonet/gonet.go") {
|
||||
return
|
||||
}
|
||||
}
|
||||
func (e *emitter) Emit(_ int, level glog.Level, _ time.Time, format string, args ...any) {
|
||||
e.logf(level, format, args...)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user