diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-06-22 15:05:22 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-06-24 13:09:34 -0400 |
| commit | 18300573f98883a4d6af09afe49a1e789e3a8f54 (patch) | |
| tree | d8a3062f606742422a7a124ac75abbe22fee3439 /pkg/specgen/generate | |
| parent | b61e429f199ca0f164054a9d758e60f94aa4d81e (diff) | |
| download | podman-18300573f98883a4d6af09afe49a1e789e3a8f54.tar.gz podman-18300573f98883a4d6af09afe49a1e789e3a8f54.tar.bz2 podman-18300573f98883a4d6af09afe49a1e789e3a8f54.zip | |
Set syslog for exit commands on log-level=debug
We have a flag, --syslog, for telling logrus to log to syslog as
well as to the terminal. Previously, this flag also set the exit
command for containers to use `--syslog` (otherwise all output
from exit commands is lost). I attempted to replicate this with
Podman v2.0, but quickly ran into circular import hell (the flag
is defined in cmd/podman, I needed it in cmd/podman/containers,
cmd/podman imports cmd/podman/containers already, etc). Instead,
let's just set the syslog flag automatically on
`--log-level=debug` so we log exit commands automatically when
debug-level logs are requested. This is consistent with Conmon
and seems to make sense.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index ea6f938a8..7b4fbebf4 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -114,8 +114,7 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener } options = append(options, opts...) - // TODO: Enable syslog support - we'll need to put this in SpecGen. - exitCommandArgs, err := CreateExitCommandArgs(rt.StorageConfig(), rtc, false, s.Remove, false) + exitCommandArgs, err := CreateExitCommandArgs(rt.StorageConfig(), rtc, logrus.IsLevelEnabled(logrus.DebugLevel), s.Remove, false) if err != nil { return nil, err } |