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

Adjust Audit init in 1.12.6 to match 1.13.1 #295

Merged

Conversation

TomSweeneyRedHat
Copy link

Signed-off-by: TomSweeneyRedHat tsweeney@redhat.com
- What I did

While working on #293 I noted that the dockerd/daemon.go code in 1-13.1-rhel initialized the audit logging code in a similar manner to my fix in #292. This change brings the code in 1-12.6 in line with 1-13.1 which primarily adds a warning in a comment about the order of initialization for audit log.

- How I did it
vi is my friend, and lots of testing.

- How to verify it
There should be no discernible run time changes, the code works the same, it's just a little better ordered and commented in the code for future code maintenance.

- Description for the changelog
Adjust internal ordering of audit logging.

This is part of the series of fixes for https://bugzilla.redhat.com/show_bug.cgi?id=1496176

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
@TomSweeneyRedHat
Copy link
Author

@jwhonce @rhatdan @runcom PTAL

@rhatdan
Copy link
Member

rhatdan commented Jan 15, 2018

I am not sure we are still shipping this?

@TomSweeneyRedHat
Copy link
Author

I'm not sure if this version will still ship or not. The BZ raised this issue in this version so I decided to make the minor adjustment.

@TomSweeneyRedHat
Copy link
Author

@rhatdan @runcom Can this be merged? If not, please let me know what (if anything) I can do. This will address https://bugzilla.redhat.com/show_bug.cgi?id=1496176 which is on the 7.5 blocker list.

@rhatdan
Copy link
Member

rhatdan commented Feb 2, 2018

Yes.

@rhatdan rhatdan merged commit 1f50612 into projectatomic:docker-1.12.6 Feb 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants