foreman-tasks 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33e51f8a561fcf981de582b170e3a58a4be50b8b
-  data.tar.gz: f77f1a81f93d978251f66018719d6efed2ba190d
+  metadata.gz: 75a0c194b28a59aafb23cc9b70c07cab8f0fb7b8
+  data.tar.gz: 192f323079a16cb61e860c817e18c76f1ad9c5c6
 SHA512:
-  metadata.gz: 863173962400843217480075a4b8f274b7c335549cda126e64b68e90cfdc9c083750efd513fcbf1ad2e1c24a18f954ce4ffca2c529d877e0a55c068cda17f9cf
-  data.tar.gz: d7272a600ccc1843276d89dc3caf9209af1839e6f3eb67f52d1d01f39bb092304b3ca5d66643c87f1fea6d8da816232e9260c05dd3e7309098f8e601489b3b03
+  metadata.gz: 93738395b7781693f7d0613ff1085406a97593e0a94049993a5ae623d511c7617f336b29e2923b503324d427456a6e56306656f51894132be047b9c1788b5efa
+  data.tar.gz: f5ffb4b22a8168074c3aaddc7ee57f591a6412349c90fc644865389b12647d0f9815c5775a18dcb1cd1012983f675e56fbf005ef65a77cfb8a89c98555d45c3a

data/bin/dynflow-executor

@@ -32,6 +32,9 @@ BANNER
   opts.on('-f', '--foreman-root=PATH', "Path to Foreman Rails root path. By default '#{options[:foreman_root]}'") do |path|
     options[:foreman_root] = path
   end
+  opts.on('-c', '--executors-count=COUNT', 'Number of parallel executors to spawn. Overrides EXECUTORS_COUNT environment varaible.') do |count|
+    options[:executors_count] = count.to_i
+  end
 end
 
 args = opts.parse!(ARGV)

data/extra/dynflow-debug.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# This file provides additional debug information for foreman-debug tool and is
+# symlinked as /usr/share/foreman/script/foreman-debug.d/60-dynflow_debug
+
+add_files /var/log/foreman/dynflow_executor*.log*
+add_files /var/log/foreman/dynflow_executor*.output*

data/lib/foreman_tasks/dynflow/daemon.rb

@@ -26,7 +26,8 @@ module ForemanTasks
                           pid_dir: "#{Rails.root}/tmp/pids",
                           log_dir: File.join(Rails.root, 'log'),
                           wait_attempts: 300,
-                          wait_sleep: 1 }
+                          wait_sleep: 1,
+                          executors_count: (ENV['EXECUTORS_COUNT'] || 1).to_i }
       options = default_options.merge(options)
       FileUtils.mkdir_p(options[:pid_dir])
       begin
@@ -41,20 +42,23 @@ module ForemanTasks
 
       STDERR.puts("Dynflow Executor: #{command} in progress")
 
-      Daemons.run_proc(options[:process_name],
+      options[:executors_count].times do
+        Daemons.run_proc(options[:process_name],
+                       :multiple => true,
                        :dir => options[:pid_dir],
                        :log_dir => options[:log_dir],
                        :dir_mode => :normal,
                        :monitor => true,
                        :log_output => true,
                        :ARGV => [command]) do |*args|
-        begin
-          ::Logging.reopen
-          run(options[:foreman_root])
-        rescue => e
-          STDERR.puts e.message
-          Foreman::Logging.exception("Failed running foreman-tasks daemon", e)
-          exit 1
+          begin
+            ::Logging.reopen
+            run(options[:foreman_root])
+          rescue => e
+            STDERR.puts e.message
+            Foreman::Logging.exception("Failed running foreman-tasks daemon", e)
+            exit 1
+          end
         end
       end
     end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -203,6 +203,7 @@ files:
 - deploy/foreman-tasks.init
 - deploy/foreman-tasks.service
 - deploy/foreman-tasks.sysconfig
+- extra/dynflow-debug.sh
 - extra/dynflow-executor.example
 - foreman-tasks.gemspec
 - lib/foreman-tasks.rb