clean up logging, fix cache condition check

cryostatio · Dec 11, 2024 · e9667a4 · e9667a4
1 parent 6f2534d
commit e9667a4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/io/cryostat/recordings/ActiveRecordings.java b/src/main/java/io/cryostat/recordings/ActiveRecordings.java
@@ -235,10 +235,10 @@ public String uploadToGrafana(
             throws Exception {
         // Send an intermediate response back to the client while another thread handles the upload
         // request
-        logger.info("Creating grafana upload request");
+        logger.trace("Creating grafana upload request");
         GrafanaActiveUploadRequest request =
                 new GrafanaActiveUploadRequest(UUID.randomUUID().toString(), remoteId, targetId);
-        logger.info(
+        logger.trace(
                 "Request created: ("
                         + request.getId()
                         + ", "

diff --git a/src/main/java/io/cryostat/recordings/ArchivedRecordings.java b/src/main/java/io/cryostat/recordings/ArchivedRecordings.java
@@ -492,10 +492,10 @@ public String uploadArchivedToGrafana(HttpServerResponse response, @RestPath Str
         }
         // Send an intermediate response back to the client while another thread handles the upload
         // request
-        logger.info("Creating grafana upload request");
+        logger.trace("Creating grafana upload request");
         GrafanaArchiveUploadRequest request =
                 new GrafanaArchiveUploadRequest(UUID.randomUUID().toString(), pair);
-        logger.info(
+        logger.trace(
                 "Request created: (" + request.getId() + ", " + request.getPair().toString() + ")");
         response.endHandler(
                 (e) -> bus.publish(LongRunningRequestGenerator.GRAFANA_ARCHIVE_ADDRESS, request));

diff --git a/src/main/java/io/cryostat/recordings/LongRunningRequestGenerator.java b/src/main/java/io/cryostat/recordings/LongRunningRequestGenerator.java
@@ -34,7 +34,7 @@
 import jakarta.inject.Inject;
 import org.apache.commons.lang3.tuple.Pair;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.slf4j.Logger;
+import org.jboss.logging.Logger;
 
 @ApplicationScoped
 public class LongRunningRequestGenerator {

diff --git a/src/main/java/io/cryostat/reports/MemoryCachingReportsService.java b/src/main/java/io/cryostat/reports/MemoryCachingReportsService.java
@@ -113,15 +113,15 @@ public Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename)
     @Override
     public boolean keyExists(ActiveRecording recording) {
         String key = ReportsService.key(recording);
-        return (quarkusCache || memoryCache)
+        return (quarkusCache && memoryCache)
                 && (activeCache.as(CaffeineCache.class).keySet().contains(key)
                         || delegate.keyExists(recording));
     }
 
     @Override
     public boolean keyExists(String jvmId, String filename) {
         String key = recordingHelper.archivedRecordingKey(jvmId, filename);
-        return (quarkusCache || memoryCache)
+        return (quarkusCache && memoryCache)
                 && (archivedCache.as(CaffeineCache.class).keySet().contains(key)
                         || delegate.keyExists(jvmId, filename));
     }

diff --git a/src/main/java/io/cryostat/reports/Reports.java b/src/main/java/io/cryostat/reports/Reports.java
@@ -95,7 +95,7 @@ public Response get(HttpServerResponse response, @RestPath String encodedKey) {
 
         // If we don't have a cached result, delegate to the ArchiveRequestGenerator
         // and return the job ID with a location header.
-        logger.info("Cache miss. Creating archived reports request");
+        logger.trace("Cache miss. Creating archived reports request");
         ArchivedReportRequest request =
                 new ArchivedReportRequest(UUID.randomUUID().toString(), pair);
         response.bodyEndHandler(
@@ -136,7 +136,7 @@ public Response getActive(
 
         // If there isn't a cached result available, delegate to the ArchiveRequestGenerator
         // and return the job ID with a location header.
-        logger.info("Cache miss. Creating active reports request");
+        logger.trace("Cache miss. Creating active reports request");
         ActiveReportRequest request =
                 new ActiveReportRequest(UUID.randomUUID().toString(), recording);
         response.bodyEndHandler(