foreman-tasks 0.6.2 → 0.6.3

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -16,7 +16,7 @@ module ForemanTasks
     def cancel_step
       task = find_task
       flash[:notice] = _("Trying to cancel step %s") % params[:step_id]
-      ForemanTasks.dynflow.world.event(task.external_id, params[:step_id].to_i, ::Dynflow::Action::Cancellable::Cancel)
+      ForemanTasks.dynflow.world.event(task.external_id, params[:step_id].to_i, ::Dynflow::Action::Cancellable::Cancel).wait
       redirect_to foreman_tasks_task_path(task)
     end
 

data/lib/foreman_tasks/dynflow/configuration.rb

@@ -74,6 +74,22 @@ module ForemanTasks
       end
     end
 
+    def increase_db_pool_size?
+       ForemanTasks.dynflow.required? && !remote? && !Rails.env.test?
+    end
+
+    # To avoid pottential timeouts on db connection pool, make sure
+    # we have the pool bigger than the thread pool
+    def increase_db_pool_size
+      if increase_db_pool_size?
+        ActiveRecord::Base.connection_pool.disconnect!
+
+        config = ActiveRecord::Base.configurations[Rails.env]
+        config['pool'] = db_pool_size if config['pool'].to_i < db_pool_size
+        ActiveRecord::Base.establish_connection(config)
+      end
+    end
+
     protected
 
     # generates the options hash consumable by the Dynflow's world
@@ -88,7 +104,7 @@ module ForemanTasks
     def default_sequel_adapter_options
       db_config            = ActiveRecord::Base.configurations[Rails.env].dup
       db_config['adapter'] = 'postgres' if db_config['adapter'] == 'postgresql'
-      db_config['max_connections'] = db_config['pool'] if db_config['pool']
+      db_config['max_connections'] = db_pool_size if increase_db_pool_size?
 
       if db_config['adapter'] == 'sqlite3'
         db_config['adapter'] = 'sqlite'
@@ -112,20 +128,8 @@ module ForemanTasks
 
     # Sequel adapter based on Rails app database.yml configuration
     def initialize_persistence
-      if !remote && !Rails.env.test?
-        increase_db_pool_size
-      end
       ForemanTasks::Dynflow::Persistence.new(default_sequel_adapter_options)
     end
 
-    # To avoid pottential timeouts on db connection pool, make sure
-    # we have the pool bigger than the thread pool
-    def increase_db_pool_size
-      ActiveRecord::Base.connection_pool.disconnect!
-
-      config = ActiveRecord::Base.configurations[Rails.env]
-      config['pool'] = db_pool_size if config['pool'].to_i < db_pool_size
-      ActiveRecord::Base.establish_connection(config)
-    end
   end
 end

data/lib/foreman_tasks/engine.rb

@@ -58,6 +58,8 @@ module ForemanTasks
         ForemanTasks.dynflow.eager_load_actions!
       end
 
+      ForemanTasks.dynflow.config.increase_db_pool_size
+
       unless ForemanTasks.dynflow.config.lazy_initialization
         if defined?(PhusionPassenger)
           PhusionPassenger.on_event(:starting_worker_process) do |forked|

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails