diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-06-10 14:35:00 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-06-17 11:11:46 -0400 |
| commit | 0e171b7b3327948f2e9e32d9e496736bd7a48009 (patch) | |
| tree | c52bdf719ac4fb248cf19662b1fa41c2472e4aec /libpod/oci_conmon_exec_linux.go | |
| parent | 38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3 (diff) | |
| download | podman-0e171b7b3327948f2e9e32d9e496736bd7a48009.tar.gz podman-0e171b7b3327948f2e9e32d9e496736bd7a48009.tar.bz2 podman-0e171b7b3327948f2e9e32d9e496736bd7a48009.zip | |
Do not share container log driver for exec
When the container uses journald logging, we don't want to
automatically use the same driver for its exec sessions. If we do
we will pollute the journal (particularly in the case of
healthchecks) with large amounts of undesired logs. Instead,
force exec sessions logs to file for now; we can add a log-driver
flag later (we'll probably want to add a `podman logs` command
that reads exec session logs at the same time).
As part of this, add support for the new 'none' logs driver in
Conmon. It will be the default log driver for exec sessions, and
can be optionally selected for containers.
Great thanks to Joe Gooch (mrwizard@dok.org) for adding support
to Conmon for a null log driver, and wiring it in here.
Fixes #6555
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/oci_conmon_exec_linux.go')
| -rw-r--r-- | libpod/oci_conmon_exec_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index bc39100f8..6be8534d9 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -392,7 +392,7 @@ func (r *ConmonOCIRuntime) startExec(c *Container, sessionID string, options *Ex return nil, nil, err } - args := r.sharedConmonArgs(c, sessionID, c.execBundlePath(sessionID), c.execPidPath(sessionID), c.execLogPath(sessionID), c.execExitFileDir(sessionID), ociLog, "") + args := r.sharedConmonArgs(c, sessionID, c.execBundlePath(sessionID), c.execPidPath(sessionID), c.execLogPath(sessionID), c.execExitFileDir(sessionID), ociLog, define.NoLogging, "") if options.PreserveFDs > 0 { args = append(args, formatRuntimeOpts("--preserve-fds", fmt.Sprintf("%d", options.PreserveFDs))...) |