From f225fdbbe77c2017225517adcf67df70fcf8e36e Mon Sep 17 00:00:00 2001
From: Fabricio Voznika <fvoznika@google.com>
Date: Thu, 22 Aug 2019 18:25:57 -0700
Subject: Log message sent before logging is setup
Moved log message to after the log options have
been read and log setup.
PiperOrigin-RevId: 264964171
---
runsc/main.go | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/runsc/main.go b/runsc/main.go
index e864118b2..c61583441 100644
--- a/runsc/main.go
+++ b/runsc/main.go
@@ -117,13 +117,6 @@ func main() {
// All subcommands must be registered before flag parsing.
flag.Parse()
- if *testOnlyAllowRunAsCurrentUserWithoutChroot {
- // SIGTERM is sent to all processes if a test exceeds its
- // timeout and this case is handled by syscall_test_runner.
- log.Warningf("Block the TERM signal. This is only safe in tests!")
- signal.Ignore(syscall.SIGTERM)
- }
-
// Are we showing the version?
if *showVersion {
// The format here is the same as runc.
@@ -265,6 +258,13 @@ func main() {
log.Infof("\t\tStrace: %t, max size: %d, syscalls: %s", conf.Strace, conf.StraceLogSize, conf.StraceSyscalls)
log.Infof("***************************")
+ if *testOnlyAllowRunAsCurrentUserWithoutChroot {
+ // SIGTERM is sent to all processes if a test exceeds its
+ // timeout and this case is handled by syscall_test_runner.
+ log.Warningf("Block the TERM signal. This is only safe in tests!")
+ signal.Ignore(syscall.SIGTERM)
+ }
+
// Call the subcommand and pass in the configuration.
var ws syscall.WaitStatus
subcmdCode := subcommands.Execute(context.Background(), conf, &ws)
--
cgit v1.2.3