From c9eddd22ebce7e139c2eda5c50525fa1ca8268de Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 27 Jun 2018 15:55:12 -0400 Subject: 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 Closes: #1014 Approved by: TomSweeneyRedHat --- libpod/oci.go | 6 ++++++ pkg/varlinkapi/containers.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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) } -- cgit v1.2.3-54-g00ecf