Merge pull request #921 from jobrunr/bugfix/GH-920

Bugfix/gh 920
jobrunr · Jan 23, 2024 · c70cadc · c70cadc
2 parents 1c38da6 + 314e563
commit c70cadc
Show file tree

Hide file tree

Showing 6 changed files with 19,743 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -169,5 +169,4 @@ yarn-error.log*
 *.secrets
 dependency-check-bin
 dependency-check-reports
-package-lock.json
 /renovate.js
diff --git a/core/build.gradle b/core/build.gradle
@@ -108,12 +108,26 @@ normalization {
     }
 }
 
+task npmRunBuildWarning {
+    onlyIf {
+        System.getenv("CI") != "true"
+    }
+    doLast {
+        println "JobRunr Frontend not build during local development - please build it manually"
+    }
+}
+
 task npmRunBuild() {
+    onlyIf {
+        System.getenv("CI") == "true"
+    }
+
     inputs.dir('src/main/resources/org/jobrunr/dashboard/frontend/src').withPathSensitivity(PathSensitivity.RELATIVE)
     outputs.dir('src/main/resources/org/jobrunr/dashboard/frontend/build')
     outputs.cacheIf { true }
 
     doLast {
+        println "JobRunr Frontend Build started"
         exec {
             workingDir = new File(projectDir, 'src/main/resources/org/jobrunr/dashboard/frontend')
             commandLine 'sh', '-c', 'npm install'
@@ -122,10 +136,11 @@ task npmRunBuild() {
             workingDir = new File(projectDir, 'src/main/resources/org/jobrunr/dashboard/frontend')
             commandLine 'sh', '-c', 'npm run build'
         }
-        println "JobRunr Frontend is build"
+        println "JobRunr Frontend Build succeeded"
     }
 }
 
+npmRunBuild.dependsOn npmRunBuildWarning
 processResources.dependsOn npmRunBuild
 sourcesJar.dependsOn npmRunBuild
 

diff --git a/core/src/main/java/org/jobrunr/jobs/filters/JobFilterUtils.java b/core/src/main/java/org/jobrunr/jobs/filters/JobFilterUtils.java
@@ -7,7 +7,7 @@
 
 public class JobFilterUtils {
 
-    private JobDefaultFilters jobDefaultFilters;
+    private final JobDefaultFilters jobDefaultFilters;
 
     public JobFilterUtils(JobDefaultFilters jobDefaultFilters) {
         this.jobDefaultFilters = jobDefaultFilters;
@@ -48,4 +48,8 @@ public void runOnStateAppliedFilters(List<Job> jobs, boolean executeJobServerFil
             jobs.forEach(this::runOnStateAppliedFilters);
         }
     }
+
+    public void runOnJobProcessingFailedFilters(Job job, Exception e) {
+        new JobPerformingFilters(job, jobDefaultFilters).runOnJobProcessingFailedFilters(e);
+    }
 }
diff --git a/core/src/main/java/org/jobrunr/server/zookeeper/tasks/ProcessOrphanedJobsTask.java b/core/src/main/java/org/jobrunr/server/zookeeper/tasks/ProcessOrphanedJobsTask.java
@@ -31,7 +31,8 @@ protected void runTask() {
     }
 
     private void changeJobStateToFailedAndRunJobFilter(Job job) {
-        job.failed("Orphaned job", new IllegalThreadStateException("Job was too long in PROCESSING state without being updated."));
-        jobFilterUtils.runOnStateAppliedFilters(job);
+        IllegalThreadStateException e = new IllegalThreadStateException("Job was too long in PROCESSING state without being updated.");
+        jobFilterUtils.runOnJobProcessingFailedFilters(job, e);
+        job.failed("Orphaned job", e);
     }
 }