diff options
author | Fabricio Voznika <fvoznika@google.com> | 2019-08-22 18:25:57 -0700 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-08-22 18:27:16 -0700 |
commit | f225fdbbe77c2017225517adcf67df70fcf8e36e (patch) | |
tree | 8c24dfd93d34dac94f49667290be8d8b0669ea72 | |
parent | 761e4bf2fe520dae1120341b09c26be1577a2adb (diff) |
Log message sent before logging is setup
Moved log message to after the log options have
been read and log setup.
PiperOrigin-RevId: 264964171
-rw-r--r-- | runsc/main.go | 14 |
1 files 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) |