Fix review comments

Hyperfoil · May 1, 2024 · cef23cf · cef23cf
1 parent 0b26b15
commit cef23cf
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/...ackend/src/main/java/io/hyperfoil/tools/horreum/changedetection/HunterEDivisiveModel.java b/...ackend/src/main/java/io/hyperfoil/tools/horreum/changedetection/HunterEDivisiveModel.java
@@ -102,31 +102,11 @@ public void analyze(List<DataPointDAO> dataPoints, JsonNode configuration, Consu
             );
         } finally {
             if (tmpFiles != null) {
-                cleanupTmpFiles(tmpFiles);
+                tmpFiles.cleanup();
             }
         }
     }
 
-    protected void cleanupTmpFiles(TmpFiles tmpFiles) {
-        if( tmpFiles.tmpdir.exists() ) {
-            clearDir(tmpFiles.tmpdir);
-        } else {
-            log.debugf("Trying to cleanup temp files, but they do not exist!");
-        }
-    }
-
-
-    private void clearDir(File dir){
-        Arrays.stream(dir.listFiles()).forEach(file -> {
-            if ( file.isDirectory() ){
-                clearDir(file);
-            }
-            file.delete();
-        });
-        if(!dir.delete()){
-            log.errorf("Failed to cleanup up temporary files: %s", dir.getAbsolutePath());
-        }
-    }
 
     protected void processChangePoints(Function<Integer, Optional<DataPointDAO>> changePointSupplier, Consumer<ChangeDAO> changeConsumer, TmpFiles tmpFiles, Instant sinceInstance) {
         String command = "hunter analyze horreum --since '" + sinceInstance.toString() + "'";
@@ -258,6 +238,25 @@ public TmpFiles() throws IOException {
             }
 
         }
+        protected void cleanup() {
+            if( tmpdir.exists() ) {
+                clearDir(tmpdir);
+            } else {
+                log.debugf("Trying to cleanup temp files, but they do not exist!");
+            }
+        }
+
+        private void clearDir(File dir){
+            Arrays.stream(dir.listFiles()).forEach(file -> {
+                if ( file.isDirectory() ){
+                    clearDir(file);
+                }
+                file.delete();
+            });
+            if(!dir.delete()){
+                log.errorf("Failed to cleanup up temporary files: %s", dir.getAbsolutePath());
+            }
+        }
     }
 
 

diff --git a/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/AlertingServiceImpl.java b/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/AlertingServiceImpl.java
@@ -701,7 +701,7 @@ private void runChangeDetection(VariableDAO variable, JsonNode fingerprint, bool
                   });
                } catch (ChangeDetectionException e) {
                   new ChangeDetectionLogDAO(variable, fingerprint, PersistentLogDAO.ERROR, e.getLocalizedMessage()).persist();
-                  throw new RuntimeException(e);
+                  log.error("An error occurred while running change detection!", e);
                }
             }
          }

diff --git a/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/changedetection/EdivisiveTests.java b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/changedetection/EdivisiveTests.java
@@ -86,8 +86,8 @@ public void testFileStructures() {
 
             assertFalse(valid);
 
+            tmpFiles.cleanup();
 
-            //todo:: cleanup temp files
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -148,7 +148,7 @@ public void testDetectedChangePoints(){
 
             assertEquals(1535410, changePoints.get(0).dataset.id);
 
-            model.cleanupTmpFiles(tmpFiles);
+            tmpFiles.cleanup();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }