Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default for log-tag #605

Merged
merged 1 commit into from
Jun 10, 2021
Merged

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jun 7, 2021

Needed for containers/podman#10204

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 7, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved label Jun 7, 2021
@rhatdan
Copy link
Member Author

rhatdan commented Jun 8, 2021

@containers/podman-maintainers PTAL
@giuseppe @vrothberg PTAL

@@ -137,6 +137,10 @@ type ContainersConfig struct {
// Negative values indicate that the log file won't be truncated.
LogSizeMax int64 `toml:"log_size_max,omitempty"`

// Specifies default format tag for container log messages. Helpful for specific
// container log, messages. Containers logs default to truncated container ID.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the above, change here too.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something must have gone wrong while copy-pasting. The sentence above starts in the middle.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, Fixed.

@rhatdan
Copy link
Member Author

rhatdan commented Jun 9, 2021

@containers/podman-maintainers PTAL
I want to get this in to complete fixing a bug in Podman.

**log_tag**=""

Default format tag for container log messages. This is useful for creating a specific tag for container log messages. Container log messages default to using the truncated container ID as a tag.
container log, messages. Containers logs default to truncated container ID.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
container log, messages. Containers logs default to truncated container ID.

@rhatdan rhatdan force-pushed the log branch 2 times, most recently from ce0f069 to 2ca5af7 Compare June 9, 2021 12:42
Needed for containers/podman#10204

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Copy link
Member

@ashley-cui ashley-cui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rhatdan rhatdan added the lgtm label Jun 10, 2021
@openshift-merge-robot openshift-merge-robot merged commit 6a2f926 into containers:master Jun 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants