fix flare archive #1171
Merged
fix flare archive #1171
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gmmeyer
previously approved these changes
Feb 6, 2018
| return err | ||
| } | ||
|
|
||
| func zipLogFiles(zipFile *archivex.ZipFile, hostname, logFilePath string) error { | ||
| func zipLogFiles(tempDir, hostname, logFilePath string) error { |
There was a problem hiding this comment.
These functions aren't actually zipping anymore. They're adding it to a directory. Might be worthwhile to change the names, though not a blocker on merging.
|
|
||
| f := filepath.Join(tempDir, hostname, "status.log") | ||
|
|
||
| err = ensureParentDirsExist(f) |
There was a problem hiding this comment.
How could this happen unless the temp directory failed to create
There was a problem hiding this comment.
No way, I think, but I always like to handle functions that return error.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Previously we were assigning archive file entries full path names, instead of giving the archive an actual structure.
Motivation
Support needs this
Note
github.com/ugorji/goneeds to be pinned like I have it now (8c0409fcbb70099c748d71f714529204975f6c3f) until etcd-io/etcd#8715 is fully resolved