diff options
| author | Adin Scannell <ascannell@google.com> | 2020-02-25 12:22:09 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-02-25 12:25:38 -0800 |
| commit | 6def8ea6ac601daa9256a31f818db9f7eb532168 (patch) | |
| tree | 0a1263e442b9a3216aa954ee55490cf1c053c461 /pkg/log/glog.go | |
| parent | 98b693e61b37a62f7b29ce1cab8b4c4c54fa044e (diff) | |
Fix nested logging.
PiperOrigin-RevId: 297175316
Diffstat (limited to 'pkg/log/glog.go')
| -rw-r--r-- | pkg/log/glog.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/log/glog.go b/pkg/log/glog.go index cab5fae55..b4f7bb5a4 100644 --- a/pkg/log/glog.go +++ b/pkg/log/glog.go @@ -46,7 +46,7 @@ var pid = os.Getpid() // line The line number // msg The user-supplied message // -func (g *GoogleEmitter) Emit(level Level, timestamp time.Time, format string, args ...interface{}) { +func (g *GoogleEmitter) Emit(depth int, level Level, timestamp time.Time, format string, args ...interface{}) { // Log level. prefix := byte('?') switch level { @@ -64,9 +64,7 @@ func (g *GoogleEmitter) Emit(level Level, timestamp time.Time, format string, ar microsecond := int(timestamp.Nanosecond() / 1000) // 0 = this frame. - // 1 = Debugf, etc. - // 2 = Caller. - _, file, line, ok := runtime.Caller(2) + _, file, line, ok := runtime.Caller(depth + 1) if ok { // Trim any directory path from the file. slash := strings.LastIndexByte(file, byte('/')) |