diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-27 15:55:12 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-29 08:22:27 +0000 |
| commit | c9eddd22ebce7e139c2eda5c50525fa1ca8268de (patch) | |
| tree | 30de450c4e2da23f0ae79559a8916e0bb6abe838 | |
| parent | d61d8a35e02303fab9661c086e8f80744fd953c4 (diff) | |
| download | podman-c9eddd22ebce7e139c2eda5c50525fa1ca8268de.tar.gz podman-c9eddd22ebce7e139c2eda5c50525fa1ca8268de.tar.bz2 podman-c9eddd22ebce7e139c2eda5c50525fa1ca8268de.zip | |
conmon no longer writes to syslog
If the caller sets up the app to be in logrus.DebugLevel,
then we will add the --syslog flag to conmon to get all of the
messages.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1014
Approved by: TomSweeneyRedHat
| -rw-r--r-- | libpod/oci.go | 6 | ||||
| -rw-r--r-- | pkg/varlinkapi/containers.go | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index c7672a04d..871069627 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -280,6 +280,12 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string) (er if r.noPivot { args = append(args, "--no-pivot") } + + if logrus.GetLevel() == logrus.DebugLevel { + logrus.Debug("%s messages will be logged to syslog", r.conmonPath) + args = append(args, "--syslog") + } + logrus.WithFields(logrus.Fields{ "args": args, }).Debugf("running conmon: %s", r.conmonPath) diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index 71e5c31d0..391bbb350 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -323,7 +323,7 @@ func (i *LibpodAPI) RestartContainer(call ioprojectatomicpodman.VarlinkCall, nam // KillContainer kills a running container. If you want to use the default SIGTERM signal, just send a -1 // for the signal arg. func (i *LibpodAPI) KillContainer(call ioprojectatomicpodman.VarlinkCall, name string, signal int64) error { - var killSignal uint = uint(syscall.SIGTERM) + killSignal := uint(syscall.SIGTERM) if signal != -1 { killSignal = uint(signal) } |