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 <return> to lines returned in podman-remote logs #6635

Merged
merged 1 commit into from
Jun 16, 2020

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jun 16, 2020

Every line is sent back individually over the APIv2 as
logs, but we are not adding the '\n' to give us line breaks.

Signed-off-by: Daniel J Walsh [email protected]

Every line is sent back individually over the APIv2 as
logs, but we are not adding the '\n' to give us line breaks.

Signed-off-by: Daniel J Walsh <[email protected]>
@openshift-ci-robot
Copy link
Collaborator

[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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 16, 2020
@rhatdan
Copy link
Member Author

rhatdan commented Jun 16, 2020

Fixes #6539
@edsantiago @baude @jwhonce PTAL

@edsantiago edsantiago changed the title Add <return> to lines returen in podman-remote logs Add <return> to lines returned in podman-remote logs Jun 16, 2020
@edsantiago
Copy link
Member

Nice. Even handles the echo -n case properly:

$ ./bin/podman-remote --url $MYSOCK run --name foo2 alpine sh -c "echo -n hi;echo hi2;echo bye"
hihi2
bye
$ ./bin/podman-remote --url $MYSOCK logs foo2
hihi2
bye

...even with sleep 2 between the echos. LGTM.

@@ -370,7 +370,7 @@ func (ic *ContainerEngine) ContainerLogs(_ context.Context, nameOrIDs []string,
case <-ctx.Done():
return err
case line := <-outCh:
_, _ = io.WriteString(options.Writer, line)
_, _ = io.WriteString(options.Writer, line+"\n")
Copy link
Member

Choose a reason for hiding this comment

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

Does this do the right thing on Win-doze?

@mheon
Copy link
Member

mheon commented Jun 16, 2020

Podman logs streaming output is AFAIK a flake, restarting

@mheon
Copy link
Member

mheon commented Jun 16, 2020

LGTM

@mheon
Copy link
Member

mheon commented Jun 16, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 16, 2020
@openshift-merge-robot openshift-merge-robot merged commit e4e10df into containers:master Jun 16, 2020
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants