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.

Sign up for GitHub

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

Jump to bottom

GEODE-6707 gfsh export logs will now export rolled over gc logs #3543

Merged
merged 3 commits into from May 9, 2019
Merged

GEODE-6707 gfsh export logs will now export rolled over gc logs #3543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7cdbfb
GEODE-6707 gfsh export logs will now export rolled over gc logs
May 2, 2019
2c7220f
GEODE-6707: Relaunch CI Build
May 3, 2019
ce22c42
GEODE-6707: Relaunch CI Build for 2nd time
May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions ...st/java/org/apache/geode/management/internal/cli/util/LogExporterFileIntegrationTest.java
View file
Open in desktop
Expand Up @@ -134,4 +134,18 @@ public void findStatFiles() throws Exception {
assertThat(logExporter.findStatFiles(workingDir.toPath())).contains(statFile.toPath());
assertThat(logExporter.findStatFiles(workingDir.toPath())).doesNotContain(notALogFile.toPath());
}

@Test
// GEODE-6707 - Rolled over GC logs end with names like ".log.1"
public void findLogsWhichContainsTheWordLog() throws Exception {
File gcLogFile = new File(workingDir, "gc.log");
FileUtils.writeStringToFile(gcLogFile, "some gc log line");

File gcRolledOverLogFile = new File(workingDir, "gc.log.1");
FileUtils.writeStringToFile(gcRolledOverLogFile, "some gc log line");

assertThat(logExporter.findLogFiles(workingDir.toPath())).contains(gcLogFile.toPath());
assertThat(logExporter.findLogFiles(workingDir.toPath()))
.contains(gcRolledOverLogFile.toPath());
}
}
2 changes: 1 addition & 1 deletion geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogExporter.java
View file
Open in desktop
Expand Up @@ -169,7 +169,7 @@ private long filterAndSize(Path originalLogFile) throws IOException {
}

List<Path> findLogFiles(Path workingDir) throws IOException {
Predicate<Path> logFileSelector = (Path file) -> file.toString().toLowerCase().endsWith(".log");
Predicate<Path> logFileSelector = (Path file) -> file.toString().toLowerCase().contains(".log");
return findFiles(workingDir, logFileSelector);
}

Expand Down