From d96e06fd6e5efbd24dbb68df61233d88ac2a1b79 Mon Sep 17 00:00:00 2001 From: Jason Lyu Date: Thu, 8 Jan 2026 11:29:15 -0500 Subject: [PATCH] Fix(log): set log level for `glog` (#511) --- .github/workflows/test.yml | 4 +++- log/emitter.go | 11 ++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 309437b..382dd76 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 }} diff --git a/log/emitter.go b/log/emitter.go index 8312edb..0c505cf 100644 --- a/log/emitter.go +++ b/log/emitter.go @@ -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...) }