summaryrefslogtreecommitdiffhomepage
path: root/runsc/boot
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2020-01-27 15:37:28 -0800
committergVisor bot <gvisor-bot@google.com>2020-01-27 16:08:35 -0800
commit253c9e666cf7d52352da97d764818e510f1387c0 (patch)
tree93301f97748c69cc262c50d061a8e1411a87087b /runsc/boot
parent0e2f1b7abd219f39d67cc2cecd00c441a13eeb29 (diff)
Cleanup glog and add real caller information.
In general, we've learned that logging must be avoided at all costs in the hot path. It's unlikely that the optimizations here were significant in any case, since buffer would certainly escape. This also adds a test to ensure that the caller identification works as expected, and so that logging can be benchmarked. Original: BenchmarkGoogleLogging-6 1222255 949 ns/op With this change: BenchmarkGoogleLogging-6 517323 2346 ns/op Fixes #184 PiperOrigin-RevId: 291815420
Diffstat (limited to 'runsc/boot')
-rw-r--r--runsc/boot/compat.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/runsc/boot/compat.go b/runsc/boot/compat.go
index 9c23b9553..8995d678e 100644
--- a/runsc/boot/compat.go
+++ b/runsc/boot/compat.go
@@ -65,7 +65,7 @@ func newCompatEmitter(logFD int) (*compatEmitter, error) {
if logFD > 0 {
f := os.NewFile(uintptr(logFD), "user log file")
- target := log.MultiEmitter{c.sink, log.K8sJSONEmitter{log.Writer{Next: f}}}
+ target := &log.MultiEmitter{c.sink, &log.K8sJSONEmitter{log.Writer{Next: f}}}
c.sink = &log.BasicLogger{Level: log.Info, Emitter: target}
}
return c, nil