Skip to content

Commit 038aa35

Browse files
committed
better operation for cleanup
1 parent 651d8e3 commit 038aa35

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/java/io/cryostat/recordings/RecordingHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ private Uni<String> uploadToJFRDatasource(Path recordingPath)
13031303
});
13041304
}
13051305

1306-
Optional<Path> getRecordingCopyPath(
1306+
private Optional<Path> getRecordingCopyPath(
13071307
JFRConnection connection, Target target, String recordingName) throws Exception {
13081308
return connection.getService().getAvailableRecordings().stream()
13091309
.filter(recording -> recording.getName().equals(recordingName))

src/main/java/io/cryostat/reports/ReportsServiceImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ public Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording, Str
8787
logger.tracev(
8888
"inprocess reportFor active recording {0} {1}",
8989
recording.target.jvmId, recording.remoteId);
90-
return process(stream, filter).invoke(safeClose(stream));
90+
return process(stream, filter).eventually(safeClose(stream));
9191
} else {
9292
logger.tracev(
9393
"sidecar reportFor active recording {0} {1}",
9494
recording.target.jvmId, recording.remoteId);
95-
return fireRequest(stream, filter).invoke(safeClose(stream));
95+
return fireRequest(stream, filter).eventually(safeClose(stream));
9696
}
9797
}
9898

@@ -103,7 +103,7 @@ public Uni<Map<String, AnalysisResult>> reportFor(
103103
if (!useSidecar()) {
104104
InputStream stream = helper.getArchivedRecordingStream(jvmId, filename);
105105
logger.tracev("inprocess reportFor archived recording {0} {1}", jvmId, filename);
106-
return process(stream, filter).invoke(safeClose(stream));
106+
return process(stream, filter).eventually(safeClose(stream));
107107
} else if (usePresignedSidecar()) {
108108
logger.tracev(
109109
"sidecar reportFor presigned archived recording {0} {1}", jvmId, filename);
@@ -112,7 +112,7 @@ public Uni<Map<String, AnalysisResult>> reportFor(
112112
} else {
113113
InputStream stream = helper.getArchivedRecordingStream(jvmId, filename);
114114
logger.tracev("sidecar reportFor archived recording {0} {1}", jvmId, filename);
115-
return fireRequest(stream, filter).invoke(safeClose(stream));
115+
return fireRequest(stream, filter).eventually(safeClose(stream));
116116
}
117117
} catch (URISyntaxException e) {
118118
logger.error(e);

0 commit comments

Comments
 (0)