Refs #35806 - Add missing sequence id handling

theforeman · Dec 9, 2022 · a9ae8f2 · a9ae8f2
1 parent 35dfde1
commit a9ae8f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/lib/actions/remote_execution/proxy_action.rb b/app/lib/actions/remote_execution/proxy_action.rb
@@ -33,11 +33,12 @@ def process_proxy_data(data)
           }
         end
         if data['exit_status']
+          last = events.last || {:sequence_id => -1, :timestamp => Time.zone.now}
           events << {
-            sequence_id: events.last[:sequence_id] + 1,
+            sequence_id: last[:sequence_id] + 1,
             template_invocation_id: template_invocation.id,
             event: data['exit_status'],
-            timestamp: events.last[:timestamp],
+            timestamp: last[:timestamp],
             event_type: 'exit',
           }
         end

diff --git a/app/lib/actions/remote_execution/template_invocation_progress_logging.rb b/app/lib/actions/remote_execution/template_invocation_progress_logging.rb
@@ -6,10 +6,13 @@ def template_invocation
       end
 
       def log_template_invocation_exception(exception)
+        last = template_invocation.template_invocation_events.order(:sequence_id).last
+        id = last ? last.sequence_id + 1 : 0
         template_invocation.template_invocation_events.create!(
           :event_type => 'debug',
           :event => "#{exception.class}: #{exception.message}",
-          :timestamp => Time.zone.now
+          :timestamp => Time.zone.now,
+          :sequence_id => id
         )
       end