Refactor log file handling to standardize zip creation and improve er… #1950
Conversation
ee/debug/checkups/power_windows.go
Outdated
| powerCfgSleepStatesCmd, err := allowedcmd.Powercfg(ctx, "/availablesleepstates") | ||
| if err != nil { | ||
| return fmt.Errorf("creating powercfg sleep states command: %w", err) | ||
| } | ||
|
|
||
| hideWindow(powerCfgSleepStatesCmd) | ||
| availableSleepStatesOutput, err := powerCfgSleepStatesCmd.CombinedOutput() | ||
| sleepStatesOutput, err := powerCfgSleepStatesCmd.Output() |
There was a problem hiding this comment.
what's the reason for this change? I'm not sure we'd want to lose the combined output here, I don't think err alone is typically very helpful for debugging with these
There was a problem hiding this comment.
That's fair, I oversimplified here. Adding the combined output back
| } | ||
|
|
||
| return nil | ||
| return addFileToZip(z, "/var/log/install.log") |
There was a problem hiding this comment.
I think this has the inadvertent effect that it's going to cause the end files to be named something else, is that correct? I don't think that's inherently wrong, but I want to note it.
I think we might even want it, since I'd thought about the idea of moving all the files into a dedicated file directory, instead of mini zip files for each flare.
There was a problem hiding this comment.
That's correct the file will always be install.log instead of varying for macos
This pull request introduces significant changes to the
checkupspackage, focusing on improving the handling of file zipping operations. The changes include adding new helper functions for zipping files and streams, and refactoring existing code to utilize these new functions.Resolves #1949
Improvements to file zipping operations:
ee/debug/checkups/util.go: Added new helper functionaddStreamToZipto streamline the process of adding files and streams to a zip archive with metadata. [1] [2] [3] [4]Refactoring existing code to use new helper functions:
ee/debug/checkups/download_directory.go: Updated theRunmethod to useaddFileToZipfor adding files to the zip archive and changed the extra file name tokolide-installers-all-users.zip. [1] [2] [3] [4]ee/debug/checkups/init_logs_darwin.go,ee/debug/checkups/init_logs_linux.go,ee/debug/checkups/init_logs_windows.go: Refactored thewriteInitLogsfunction to useaddFileToZipandaddStreamToZipfor zipping log files and command outputs. [1] [2] [3] [4] [5] [6]ee/debug/checkups/install.go: Simplified thegatherInstallationLogsandgatherInstallerInfofunctions by usingaddFileToZipfor zipping installation logs and installer info files. [1] [2]ee/debug/checkups/launchd_darwin.go: Updated theRunmethod to useaddFileToZipandaddStreamToZipfor zipping plist files and command outputs. [1] [2] [3]ee/debug/checkups/logs.go: Refactored theRunmethod to useaddFileToZipfor adding log files to the zip archive.ee/debug/checkups/power_windows.go: Simplified theRunmethod by usingaddFileToZipandaddStreamToZipfor zipping power reports and command outputs. [1] [2]…ror reporting