Drop the non event based output handling

theforeman · Apr 4, 2024 · 29c8603 · 29c8603
1 parent e6327d8
commit 29c8603
Showing 1 changed file with 3 additions and 23 deletions.
diff --git a/app/lib/actions/remote_execution/run_host_job.rb b/app/lib/actions/remote_execution/run_host_job.rb
@@ -69,7 +69,7 @@ def inner_plan(job_invocation, host, template_invocation, proxy_selector, option
                                  .merge(additional_options)
 
         plan_delegated_action(proxy, provider.proxy_action_class, action_options, proxy_action_class: ::Actions::RemoteExecution::ProxyAction)
-        plan_self :with_event_logging => true
+        plan_self
       end
 
       def finalize(*args)
@@ -126,27 +126,7 @@ def continuous_output_providers
       end
 
       def fill_continuous_output(continuous_output)
-        if input[:with_event_logging]
-          continuous_output_from_template_invocation_events(continuous_output)
-          return
-        end
-
-        delegated_output.fetch('result', []).each do |raw_output|
-          continuous_output.add_raw_output(raw_output)
-        end
-
-        final_timestamp = (continuous_output.last_timestamp || task.ended_at).to_f + 1
-
-        if task.state == 'stopped' && task.result == 'cancelled'
-          continuous_output.add_output(_('Job cancelled by user'), 'debug', final_timestamp)
-        else
-          fill_planning_errors_to_continuous_output(continuous_output) unless exit_status
-        end
-        if exit_status
-          continuous_output.add_output(_('Exit status: %s') % exit_status, 'stdout', final_timestamp)
-        elsif run_step&.error
-          continuous_output.add_output(_('Job finished with error') + ": #{run_step.error.exception_class} - #{run_step.error.message}", 'debug', final_timestamp)
-        end
+        continuous_output_from_template_invocation_events(continuous_output)
       rescue => e
         continuous_output.add_exception(_('Error loading data from proxy'), e)
       end
@@ -170,7 +150,7 @@ def continuous_output_from_template_invocation_events(continuous_output)
       end
 
       def exit_status
-        input[:with_event_logging] ? task.template_invocation.template_invocation_events.find_by(event_type: 'exit')&.event : delegated_output[:exit_status]
+        task.template_invocation.template_invocation_events.find_by(event_type: 'exit')&.event
       end
 
       def host_id