Adding rolled custom logs in support bundle #627
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
nevingeorgesunny
changed the title
|
Test failure sounds legitimate. |
jglick
reviewed
Feb 20, 2025
| @@ -95,6 +95,30 @@ public Iterable<LogRecord> getLogRecords() { | |||
| } | |||
| }); | |||
| } | |||
|
|
|||
| // Add rotated log files | |||
| File[] rotatedLogFiles = customLogs.listFiles((dir, filename) -> filename.matches(name + "\\.log\\.\\d+")); | |||
There was a problem hiding this comment.
BTW I find
Suggested change
| File[] rotatedLogFiles = customLogs.listFiles((dir, filename) -> filename.matches(name + "\\.log\\.\\d+")); | |
| File[] rotatedLogFiles = customLogs.listFiles((dir, filename) -> filename.matches(name + "[.]log[.][0-9]+")); |
a bit more legible (so I do not need to mentally parse out backslashes).
jglick
reviewed
Feb 20, 2025
| String logRotationNumber = logNameParts[logNameParts.length - 1]; | ||
|
|
||
| result.add( | ||
| new FileContent(rotatedEntryName, new String[] {name, logRotationNumber}, rotatedLogFile)); |
There was a problem hiding this comment.
logRotationNumber is not actually a “filterable parameter”. name would be.
jglick
reviewed
Feb 20, 2025
src/main/java/com/cloudbees/jenkins/support/impl/CustomLogs.java
Outdated
Show resolved
Hide resolved
jglick
reviewed
Feb 20, 2025
Comment on lines
96
to
97
| try (FileWriter writer = new FileWriter(new File(customLogsDir, "test1.log"))) { | ||
| writer.write("test1 one"); |
There was a problem hiding this comment.
there is a Files method for this
jglick
approved these changes
Feb 20, 2025
Co-authored-by: Jesse Glick <jglick@cloudbees.com>
| @@ -44,7 +44,7 @@ public class CustomLogs extends Component { | |||
|
|
|||
| private static final Logger LOGGER = Logger.getLogger(CustomLogs.class.getName()); | |||
| private static final int MAX_ROTATE_LOGS = Integer.getInteger(CustomLogs.class.getName() + ".MAX_ROTATE_LOGS", 9); | |||
| private static final File customLogs = new File(SafeTimerTask.getLogsRoot(), "custom"); | |||
| private final File customLogs = new File(SafeTimerTask.getLogsRoot(), "custom"); | |||
There was a problem hiding this comment.
I removed static as when I was running a test class, [CustomLogsTest.java], it has 3 test in it for some reason SafeTimerTask.getLogsRoot() was same for all test , due to which test were failing ,
removing static fixed this , i think its similar to #617 (comment)
[edited, please paste raw discussion permalinks]
jglick
reviewed
Feb 20, 2025
| } | ||
| } | ||
|
|
||
| private static final class LogFile { | ||
| private final RewindableRotatingFileOutputStream stream; | ||
| private final Handler handler; | ||
| private int count; | ||
| private final File customLogs = new File(SafeTimerTask.getLogsRoot(), "custom"); |
jglick
reviewed
Feb 20, 2025
| try (FileWriter writer = new FileWriter(new File(customLogsDir, "nonRotatedCustomLog.log"))) { | ||
| writer.write("nonRotatedCustomLog one"); | ||
| } | ||
| Files.write(Paths.get(customLogsDir.getPath(), "test1.log"), "test1 one".getBytes(), StandardOpenOption.CREATE); |
There was a problem hiding this comment.
just
Suggested change
| Files.write(Paths.get(customLogsDir.getPath(), "test1.log"), "test1 one".getBytes(), StandardOpenOption.CREATE); | |
| Files.write(Paths.get(customLogsDir.getPath(), "test1.log"), "test1 one".getBytes()); |
suffices (ditto elsewhere)
|
|
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.
No description provided.