summaryrefslogtreecommitdiff
path: root/libpod/runtime_ctr.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-29 17:51:27 +0200
committerGitHub <noreply@github.com>2019-05-29 17:51:27 +0200
commit294448c2ea880ec550548537b0681a0e30e161d7 (patch)
treebf19af8e02cc57a422174cd9e3e6e24e221eac59 /libpod/runtime_ctr.go
parentc9357f07cea6a62e59714200073541711aa3b55c (diff)
parent88429242ddf82c03509ca66a687d9fb1534d2446 (diff)
downloadpodman-294448c2ea880ec550548537b0681a0e30e161d7.tar.gz
podman-294448c2ea880ec550548537b0681a0e30e161d7.tar.bz2
podman-294448c2ea880ec550548537b0681a0e30e161d7.zip
Merge pull request #2709 from haircommander/journald
Add libpod journald logging
Diffstat (limited to 'libpod/runtime_ctr.go')
-rw-r--r--libpod/runtime_ctr.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index cba8bdb1a..0c8d3edab 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -196,7 +196,7 @@ func (r *Runtime) newContainer(ctx context.Context, rSpec *spec.Spec, options ..
}
}
- if ctr.config.LogPath == "" {
+ if ctr.config.LogPath == "" && ctr.config.LogDriver != JournaldLogging {
ctr.config.LogPath = filepath.Join(ctr.config.StaticDir, "ctr.log")
}