Skip to content

Commit

Permalink
Refs #37320 - Set real timestamps on outputs
Browse files Browse the repository at this point in the history
  • Loading branch information
adamruzicka committed Nov 1, 2024
1 parent cdbf09e commit c69d2b5
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions lib/smart_proxy_ansible/runner/ansible_runner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def hostname_for_event(event)

def handle_host_event(hostname, event)
log_event("for host: #{hostname.inspect}", event)
publish_data_for(hostname, event['stdout'] + "\n", 'stdout', id: event['uuid']) if event['stdout']
publish_data_for(hostname, event['stdout'] + "\n", 'stdout', id: event['uuid'], timestamp: event['created']) if event['stdout']
case event['event']
when 'runner_on_ok'
publish_exit_status_for(hostname, 0) if @exit_statuses[hostname].nil?
Expand All @@ -147,23 +147,25 @@ def handle_broadcast_data(event)
header, *rows = event['stdout'].strip.lines.map(&:rstrip)
# #lines strips the leading newline that precedes the header
broadcast_data("\n" + header + "\n", 'stdout')

inventory_hosts = @outputs.keys.select { |key| key.is_a? String }
rows.each do |row|
host = inventory_hosts.find { |host| row =~ /#{host}/ }
line = row + "\n"
unless host
broadcast_data(line, 'stdout', id: event['uuid'])
broadcast_data(line, 'stdout', id: event['uuid'], timestamp: event['created'])
next
end

publish_data_for(host, line, 'stdout', id: event['uuid'])
publish_data_for(host, line, 'stdout', id: event['uuid'], timestamp: event['created'])

# If the task has been rescued, it won't consider a failure
if @exit_statuses[host].to_i != 0 && failures[host].to_i <= 0 && unreachable[host].to_i <= 0 && rescued[host].to_i > 0
publish_exit_status_for(host, 0)
end
end
else
broadcast_data(event['stdout'] + "\n", 'stdout', id: event['uuid'])
broadcast_data(event['stdout'] + "\n", 'stdout', id: event['uuid'], timestamp: event['created'])
end

# If the run ends early due to an error - fail all other tasks
Expand Down

0 comments on commit c69d2b5

Please sign in to comment.