summaryrefslogtreecommitdiffhomepage
path: root/runsc
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-04-17 20:44:17 +0000
committergVisor bot <gvisor-bot@google.com>2020-04-17 20:44:17 +0000
commit3657268d563112e85bf70b50c9988f86e9603d09 (patch)
tree85c06c1e47208ea2e7ead182139f830d2e199888 /runsc
parent0f9e6d074af4099c048ec9b31035cbc6cc30474d (diff)
parenta80cd4302337f1c3a807e127f5a6edc2f014f431 (diff)
Merge release-20200323.0-180-ga80cd43 (automated)
Diffstat (limited to 'runsc')
-rw-r--r--runsc/main.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/runsc/main.go b/runsc/main.go
index 9d52f3006..2baba90f8 100644
--- a/runsc/main.go
+++ b/runsc/main.go
@@ -296,9 +296,7 @@ func main() {
if err := syscall.Dup3(fd, int(os.Stderr.Fd()), 0); err != nil {
cmd.Fatalf("error dup'ing fd %d to stderr: %v", fd, err)
}
- }
-
- if *alsoLogToStderr {
+ } else if *alsoLogToStderr {
e = &log.MultiEmitter{e, newEmitter(*debugLogFormat, os.Stderr)}
}