Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #37320 - Set IDs on outputs #88

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes #37320 - Set IDs on outputs #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
276dcb7
Fixes #37320 - Set IDs on outputs
adamruzicka Apr 5, 2024
cdbf09e
Bump dependency on smart_proxy_dynflow
adamruzicka Nov 1, 2024
c69d2b5
Refs #37320 - Set real timestamps on outputs
adamruzicka Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/smart_proxy_ansible/runner/ansible_runner.rb
View file
Open in desktop
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') 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 @@ -153,19 +153,19 @@ def handle_broadcast_data(event)
host = inventory_hosts.find { |host| row =~ /#{host}/ }
line = row + "\n"
unless host
broadcast_data(line, 'stdout')
broadcast_data(line, 'stdout', id: event['uuid'], timestamp: event['created'])
next
end

publish_data_for(host, line, 'stdout')
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')
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
2 changes: 1 addition & 1 deletion smart_proxy_ansible.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ Gem::Specification.new do |gem|
gem.add_development_dependency('logger')
gem.add_development_dependency('smart_proxy')
gem.add_runtime_dependency('net-ssh')
gem.add_runtime_dependency('smart_proxy_dynflow', '~> 0.8')
gem.add_runtime_dependency('smart_proxy_dynflow', '~> 0.8', '>= 0.10')
gem.add_runtime_dependency('smart_proxy_remote_execution_ssh', '~> 0.4')
end