complete regrouping of pipeline status probe

yaauie · yaauie · commit bcb0563dda77 · 2024-10-07T13:09:37.000Z
diff --git a/logstash-core/lib/logstash/agent.rb b/logstash-core/lib/logstash/agent.rb
@@ -168,16 +168,17 @@ def pipeline_details(pipeline_id)
       return PipelineIndicator::Details.new(PipelineIndicator::RunState::UNKNOWN)
     end
 
-    run_state = pipeline_state.synchronize do |sync_state|
+    status = pipeline_state.synchronize do |sync_state|
       case
       when sync_state.loading?    then PipelineIndicator::Status::LOADING
       when sync_state.crashed?    then PipelineIndicator::Status::TERMINATED
       when sync_state.running?    then PipelineIndicator::Status::RUNNING
       when sync_state.finished?   then PipelineIndicator::Status::FINISHED
+      else                             PipelineIndicator::Status::UNKNOWN
       end
     end
 
-    return PipelineIndicator::Details.new(run_state)
+    return PipelineIndicator::Details.new(status)
   end
 
   def auto_reload?
diff --git a/logstash-core/src/main/java/org/logstash/health/PipelineIndicator.java b/logstash-core/src/main/java/org/logstash/health/PipelineIndicator.java
@@ -65,7 +65,7 @@ public static class Details implements Observation {
         private final Status status;
 
         public Details(final Status status) {
-            this.status = Objects.requireNonNull(status, "runState cannot be null");
+            this.status = Objects.requireNonNull(status, "status cannot be null");
         }
         public Status getStatus() {
             return this.status;

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public static class Details implements Observation {`
`65`	`65`	`private final Status status;`
`66`	`66`
`67`	`67`	`public Details(final Status status) {`
`68`		`- this.status = Objects.requireNonNull(status, "runState cannot be null");`
	`68`	`+ this.status = Objects.requireNonNull(status, "status cannot be null");`
`69`	`69`	`}`
`70`	`70`	`public Status getStatus() {`
`71`	`71`	`return this.status;`