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

Collect log follows symlink recursively to the origin file #15420

Merged
merged 2 commits into from
Jul 6, 2017

Conversation

ailisp
Copy link
Member

@ailisp ailisp commented Jun 21, 2017

ISSUE: When collecting log using diagnostic panel of ManageIQ Configuration, when encounter symlinks, it only collect symlink, not the actual file.

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1450134

\cc @yrudman @gtanzillo

@miq-bot add-label wip, bug

@ailisp
Copy link
Member Author

ailisp commented Jun 21, 2017

@yrudman tested both symlink to dir, one and two levels of symlink, failed to pack one of the files won't make whole collecting zip fail. Ready for review. Note in my vm for testing, even the GUID file is not a symlink originally. So I move it to other place, and tested by symlink to symlink to it (two levels) or symlink to it (one level).

@ailisp ailisp force-pushed the bug-1450134 branch 2 times, most recently from 80d5423 to 4127af2 Compare June 21, 2017 18:40

it "symlink file" do
origin_file = Tempfile.new 'origin'
origin_file.puts('abc')
Copy link
Contributor

Choose a reason for hiding this comment

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

do you need it ?

@yrudman
Copy link
Contributor

yrudman commented Jun 26, 2017

👍 looks good

Very minor, could you rebase and squash to 2 commits

@ailisp ailisp changed the title [WIP] Collect log only add symlink, not file itself Collect log follows symlink recursively to the origin file Jun 26, 2017
@ailisp
Copy link
Member Author

ailisp commented Jun 26, 2017

@miq-bot remove-label wip

@miq-bot miq-bot removed the wip label Jun 26, 2017
@miq-bot
Copy link
Member

miq-bot commented Jun 26, 2017

Checked commits ailisp/manageiq@2063a76~...43f9e83 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
2 files checked, 0 offenses detected
Everything looks fine. 👍

Copy link
Member

@gtanzillo gtanzillo left a comment

Choose a reason for hiding this comment

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

Looks good, nice job!! 👍

@gtanzillo gtanzillo added this to the Sprint 64 Ending Jul 10, 2017 milestone Jul 6, 2017
@gtanzillo gtanzillo merged commit 81d5567 into ManageIQ:master Jul 6, 2017
@simaishi
Copy link
Contributor

simaishi commented Jul 6, 2017

@gtanzillo can this be fine/yes as per the target release set on the BZ?

@yrudman
Copy link
Contributor

yrudman commented Jul 6, 2017

@miq-bot add-label fine/yes

simaishi pushed a commit that referenced this pull request Aug 4, 2017
 Collect log follows symlink recursively to the origin file
(cherry picked from commit 81d5567)

https://bugzilla.redhat.com/show_bug.cgi?id=1478510
@simaishi
Copy link
Contributor

simaishi commented Aug 4, 2017

Fine backport details:

$ git log -1
commit f36a00bb09e808be38395969692e174239a9ac1d
Author: Gregg Tanzillo <gtanzill@redhat.com>
Date:   Thu Jul 6 09:20:22 2017 -0400

    Merge pull request #15420 from ailisp/bug-1450134
    
     Collect log follows symlink recursively to the origin file
    (cherry picked from commit 81d556701a5da83f0f48c58fb0274df9543769ed)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1478510

d-m-u pushed a commit to d-m-u/manageiq that referenced this pull request Jun 6, 2018
 Collect log follows symlink recursively to the origin file
(cherry picked from commit 81d5567)

https://bugzilla.redhat.com/show_bug.cgi?id=1478510
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