summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libpod/oci.go6
-rw-r--r--pkg/varlinkapi/containers.go2
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)
}