Skip to content

Commit

Permalink
Swap default logging to journald
Browse files Browse the repository at this point in the history
This eliminates the concern of log files growing infinitely and also
records all containers for posterity rather then allowing the removal
of a container to destroy the record.

Partially fixes: containers/podman#9158

Signed-off-by: Daniel J Walsh <[email protected]>
rhatdan committed Apr 29, 2021

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
1 parent d34a94a commit 98ff7e1
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/containers.conf.5.md
Original file line number Diff line number Diff line change
@@ -175,7 +175,7 @@ the container.

Indicates whether the container engine uses MAC(SELinux) container separation via labeling. This option is ignored on disabled systems.

**log_driver**="k8s-file"
**log_driver**="journald"

Logging driver for the container. Available options: `k8s-file` and `journald`.

1 change: 1 addition & 0 deletions pkg/config/config_test.go
Original file line number Diff line number Diff line change
@@ -283,6 +283,7 @@ var _ = Describe("Config", func() {
gomega.Expect(config.Network.CNIPluginDirs).To(gomega.Equal(pluginDirs))
gomega.Expect(config.Engine.NumLocks).To(gomega.BeEquivalentTo(2048))
gomega.Expect(config.Engine.OCIRuntimes["runc"]).To(gomega.Equal(OCIRuntimeMap["runc"]))
gomega.Expect(config.LogDriver()).To(gomega.Equal("journald"))
})

It("should success with valid user file path", func() {
2 changes: 1 addition & 1 deletion pkg/config/containers.conf
Original file line number Diff line number Diff line change
@@ -157,7 +157,7 @@ default_sysctls = [

# Logging driver for the container. Available options: k8s-file and journald.
#
# log_driver = "k8s-file"
# log_driver = "journald"

# Maximum size allowed for the container log file. Negative numbers indicate
# that no size limit is imposed. If positive, it must be >= 8192 to match or
2 changes: 1 addition & 1 deletion pkg/config/default.go
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ const (
// SystemdCgroupsManager represents systemd native cgroup manager
SystemdCgroupsManager = "systemd"
// DefaultLogDriver is the default type of log files
DefaultLogDriver = "k8s-file"
DefaultLogDriver = "journald"
// DefaultLogSizeMax is the default value for the maximum log size
// allowed for a container. Negative values mean that no limit is imposed.
DefaultLogSizeMax = -1

0 comments on commit 98ff7e1

Please sign in to comment.