foreman-tasks-core 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7182c93db320880e8ab630c2edcfef6baa2f6ce0
-  data.tar.gz: b578ed3de2672e41910921ad1b5cfe0cc1872f6b
+  metadata.gz: 0e2b37c0d8ce49360cb333bd3e5468f0c96c64bf
+  data.tar.gz: 4b5be57f5f8a47415581f7c70182050891e5fbcb
 SHA512:
-  metadata.gz: 4f8d31d820535c4ed018bad60c64710579f31761f3c0cd16477ee776233a0b98498f57821e72899275c20f9b2de8d3a780d5b4dcfa4ccd4e5db2a51b801a2d54
-  data.tar.gz: 9c6c676b311f5d9507765409df16d1c49c72f3da1fea223d9c3496312a62048219cf89197f81aa5787a505b4f7204eb8f6ee6d0e8fd7631badddb08d6e7d346a
+  metadata.gz: efcf179686dce26f852bfd443f8c0e9e5e624ae8630711b8ebce454fa8cf9b6e251220d729e255da034d33eeecd309cd272c5b8eb6d7b749bf7c773e5ed287c1
+  data.tar.gz: 4d388300b3d9ff1fe0ccff4f7962fd5fd543522085bcde9170ab1ff08795ceaecfbb7b06b1ae16348167fc03fa054b006e54f3cb9bfdb1d2fd8c9bd8f21a404a

data/lib/foreman_tasks_core/continuous_output.rb

@@ -8,7 +8,7 @@ module ForemanTasksCore
     end
 
     def add_raw_output(raw_output)
-      missing_args = %w(output_type output timestamp) - raw_output.keys
+      missing_args = %w[output_type output timestamp] - raw_output.keys
       unless missing_args.empty?
         raise ArgumentError, "Missing args for raw output: #{missing_args.inspect}"
       end

data/lib/foreman_tasks_core/runner/base.rb

@@ -41,6 +41,17 @@ module ForemanTasksCore
         # if cleanup is needed
       end
 
+      def timeout
+        # Override when timeouts and regular kills should be handled differently
+        publish_data('Timeout for execution passed, trying to stop the job', 'debug')
+        kill
+      end
+
+      def timeout_interval
+        # A number of seconds after which the runner should receive a #timeout
+        #   or nil for no timeout
+      end
+
       def publish_data(data, type)
         @continuous_output.add_output(data, type)
       end

data/lib/foreman_tasks_core/runner/dispatcher.rb

@@ -26,6 +26,7 @@ module ForemanTasksCore
 
         def start_runner
           @logger.debug("start runner #{@runner.id}")
+          set_timeout if @runner.timeout_interval
           @runner.start
           refresh_runner
         ensure
@@ -43,6 +44,13 @@ module ForemanTasksCore
           plan_next_refresh
         end
 
+        def timeout_runner
+          @logger.debug("timeout runner #{@runner.id}")
+          @runner.timeout
+        rescue => e
+          handle_exception(e, false)
+        end
+
         def kill
           @logger.debug("kill runner #{@runner.id}")
           @runner.kill
@@ -65,6 +73,12 @@ module ForemanTasksCore
 
         private
 
+        def set_timeout
+          timeout_time = Time.now.getlocal + @runner.timeout_interval
+          @logger.debug("setting timeout for #{@runner.id} to #{timeout_time}")
+          @clock.ping(reference, timeout_time, :timeout_runner)
+        end
+
         def plan_next_refresh
           if !@finishing && !@refresh_planned
             @logger.debug("planning to refresh #{@runner.id}")

data/lib/foreman_tasks_core/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasksCore
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks-core
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies: []
-description: 'Common code used both at Forman and Foreman proxy regarding tasks
-
-'
+description: |
+  Common code used both at Forman and Foreman proxy regarding tasks
 email:
 - inecas@redhat.com
 executables: []
@@ -50,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Common code used both at Forman and Foreman proxy regarding tasks