diff options
author | gcalin <caling@protonmail.com> | 2022-03-04 19:04:58 +0100 |
---|---|---|
committer | gcalin <caling@protonmail.com> | 2022-03-29 17:29:13 +0200 |
commit | c185d8c0d6774e90f64f4c6a84270c20a9325944 (patch) | |
tree | d6500e6d9d740cb9a60772b86cc01b4b00a33c38 /pkg | |
parent | 0eff4b70d0429c0dd1d95bc0a15f679cef351cb5 (diff) | |
download | podman-c185d8c0d6774e90f64f4c6a84270c20a9325944.tar.gz podman-c185d8c0d6774e90f64f4c6a84270c20a9325944.tar.bz2 podman-c185d8c0d6774e90f64f4c6a84270c20a9325944.zip |
Add option for pod logs to display different colors per container.
Signed-off-by: Krzysztof Baran <krysbaran@gmail.com>
Signed-off-by: gcalin <caling@protonmail.com>
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/domain/entities/containers.go | 2 | ||||
-rw-r--r-- | pkg/domain/entities/pods.go | 3 | ||||
-rw-r--r-- | pkg/domain/infra/abi/containers.go | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index 79795a221..072514d0f 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -257,6 +257,8 @@ type ContainerLogsOptions struct { Tail int64 // Show timestamps in the logs. Timestamps bool + // Show different colors in the logs. + Colors bool // Write the stdout to this Writer. StdoutWriter io.Writer // Write the stderr to this Writer. diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index da93d3f8b..a483064ab 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -149,6 +149,8 @@ type PodLogsOptions struct { ContainerLogsOptions // If specified will only fetch the logs of specified container ContainerName string + // Show different colors in the logs. + Color bool } type ContainerCreateOptions struct { @@ -482,6 +484,7 @@ func PodLogsOptionsToContainerLogsOptions(options PodLogsOptions) ContainerLogsO Until: options.Until, Tail: options.Tail, Timestamps: options.Timestamps, + Colors: options.Colors, StdoutWriter: options.StdoutWriter, StderrWriter: options.StderrWriter, } diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index f45bdeba5..35689092a 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -1088,6 +1088,7 @@ func (ic *ContainerEngine) ContainerLogs(ctx context.Context, containers []strin Until: options.Until, Tail: options.Tail, Timestamps: options.Timestamps, + Colors: options.Colors, UseName: options.Names, WaitGroup: &wg, } |