foreman-tasks-core 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51ca893401a1fbb6ce8b33970e95867d12b99523b36867ad8ae778efff6af18b
-  data.tar.gz: 7113cbc6e40d91de62f7275233ef787f6ae35b970be37c33c3cb614bb52fc1b1
+  metadata.gz: 9eeba72428b030c0bcec9f51c7b58cbfb7e046eb7279b68b6030b46aaa72a434
+  data.tar.gz: 9a40808da08504914c856d9407a7d454a5c5045125a768ee5d6b54424444bd93
 SHA512:
-  metadata.gz: '09024d809f19da128ab6f929cd4e50c39aabae1ce1a510ec537f0e36ad83fb4bbce384d1e3ce161c2eb2ecf006c1abf04b1822eaaabcf5c988582fa0858ded21'
-  data.tar.gz: 0610b37f1608bc3816315d50c9fdde8474a9a9e7a64683efd983e955e109526537266c568fe13d1a2a64e9d4d4d4031a2d9c53e832c8efa13d5076b6f83a6da5
+  metadata.gz: c9cd9a1e5c8f247bd5b3f335998d2cba76d2a17ba6edfae529713f6eaaa60de6133d61125e76175544a8248f259f48bfa715de46cd4f1ff5132844d1c5c0250d
+  data.tar.gz: 2ddb3a83487315cdbc6ecf32886d67f599badb47f61f02019122fed0103602af72f0c8e5f999016dfec36a3caa56c17202fb3ce0426f5814084d5703bd702991

data/lib/foreman_tasks_core/runner/dispatcher.rb

@@ -120,39 +120,33 @@ module ForemanTasksCore
 
       def start(suspended_action, runner)
         synchronize do
-          begin
-            raise "Actor with runner id #{runner.id} already exists" if @runner_actors[runner.id]
-            runner.logger = @logger
-            runner_actor = RunnerActor.spawn("runner-actor-#{runner.id}", self, suspended_action, runner, @clock, @logger)
-            @runner_actors[runner.id] = runner_actor
-            @runner_suspended_actions[runner.id] = suspended_action
-            runner_actor.tell(:start_runner)
-            return runner.id
-          rescue => exception
-            _handle_command_exception(runner.id, exception)
-            return nil
-          end
+          raise "Actor with runner id #{runner.id} already exists" if @runner_actors[runner.id]
+          runner.logger = @logger
+          runner_actor = RunnerActor.spawn("runner-actor-#{runner.id}", self, suspended_action, runner, @clock, @logger)
+          @runner_actors[runner.id] = runner_actor
+          @runner_suspended_actions[runner.id] = suspended_action
+          runner_actor.tell(:start_runner)
+          return runner.id
+        rescue => exception
+          _handle_command_exception(runner.id, exception)
+          return nil
         end
       end
 
       def kill(runner_id)
         synchronize do
-          begin
-            runner_actor = @runner_actors[runner_id]
-            runner_actor.tell(:kill) if runner_actor
-          rescue => exception
-            _handle_command_exception(runner_id, exception, false)
-          end
+          runner_actor = @runner_actors[runner_id]
+          runner_actor.tell(:kill) if runner_actor
+        rescue => exception
+          _handle_command_exception(runner_id, exception, false)
         end
       end
 
       def finish(runner_id)
         synchronize do
-          begin
-            _finish(runner_id)
-          rescue => exception
-            _handle_command_exception(runner_id, exception, false)
-          end
+          _finish(runner_id)
+        rescue => exception
+          _handle_command_exception(runner_id, exception, false)
         end
       end
 

data/lib/foreman_tasks_core/runner/parent.rb

@@ -10,21 +10,19 @@ module ForemanTasksCore
       end
 
       def generate_updates
-        @outputs.reduce({}) do |acc, (key, value)|
-          if value.empty? && @exit_status.nil?
-            acc
-          else
-            identifier = key
-            @outputs[identifier] = ForemanTasksCore::ContinuousOutput.new
-            key = host_action(identifier) unless identifier == @suspended_action
-            exit_status = @exit_statuses[identifier] || @exit_status if @exit_status
-            acc.merge(key => Runner::Update.new(value, exit_status))
-          end
-        end
+        base = {}
+        base[@suspended_action] = Runner::Update.new(ForemanTasksCore::ContinuousOutput.new, @exit_status) if @exit_status
+        # Operate on all hosts if the main process ended or only on hosts for which we have updates
+        @outputs.reject { |_, output| @exit_status.nil? && output.empty? }
+                .reduce(base) do |acc, (identifier, output)|
+                  @outputs[identifier] = ForemanTasksCore::ContinuousOutput.new # Create a new ContinuousOutput for next round of updates
+                  exit_status = @exit_statuses[identifier] || @exit_status if @exit_status
+                  acc.merge(host_action(identifier) => Runner::Update.new(output, exit_status))
+                end
       end
 
       def initialize_continuous_outputs
-        @outputs = ([@suspended_action] + @targets.keys).reduce({}) do |acc, target|
+        @outputs = @targets.keys.reduce({}) do |acc, target|
           acc.merge(target => ForemanTasksCore::ContinuousOutput.new)
         end
       end
@@ -39,8 +37,8 @@ module ForemanTasksCore
         @outputs.each { |_k, output| output.add_output(data, type) }
       end
 
-      def publish_data(data, type)
-        @outputs[@suspended_action].add_output(data, type)
+      def publish_data(_data, _type)
+        true
       end
 
       def publish_data_for(identifier, data, type)

data/lib/foreman_tasks_core/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasksCore
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.3.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks-core
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -26,7 +26,7 @@ dependencies:
         version: 1.2.0
 description: 'Common code used both at Forman and Foreman proxy regarding tasks
 
-'
+  '
 email:
 - inecas@redhat.com
 executables: []
@@ -60,9 +60,10 @@ files:
 - lib/foreman_tasks_core/ticker.rb
 - lib/foreman_tasks_core/version.rb
 homepage: https://github.com/theforeman/foreman-tasks
-licenses: []
+licenses:
+- GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,8 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Common code used both at Forman and Foreman proxy regarding tasks
 test_files: []