foreman-tasks 0.6.15 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWU1NDFhZjAxYjZkNDAwYzJkZTA0YTBlOTcxMGQ3NGIxYTQzNWFiYg==
+    YzVkNDM3MzdlYjM0YmI2NTE5ZjE3YTY4MmYyNWQ2NDMyYmFlYzgxMA==
   data.tar.gz: !binary |-
-    YmVmNjMwODk3YTNiYTY1NGNjYWUyMDI3NDBkZTM4ZmVjN2M1ZDllMA==
+    MGFiYzQ3MGQyMWFlMTkyNjBjMDYzZGFkNDA3YTdkNTAyZGI1Yzg5MQ==
 SHA512:
   metadata.gz: !binary |-
-    MzM3NjM1M2Y1ODA2NmYwZDMzZjE1OTZiN2I3NDRmOWNmOTFkOTc5ZWQ2Yzc3
-    NWI0ZTZmOGU5OWU1MzhlMTM3NmQ3MDZjYjIxNTEzOTY1OGYzYzI3ODE4ZGZi
-    NzhhZGExNDkxZjMwYjJmZjFmYzUyYTk5NDI2YmY0N2I1NWE0ODk=
+    ODk5NDBhNDQ5MDI5YjI0ODQ4NDkyNDUwYTYxY2FjODM0ZTZjNzk5N2Y2YmI3
+    MDhjNWM1MDEyOTg4ZmE5NjIyNGNjYjJhZjUwMjRmMTQ1OGZiNjA5MWNiODQw
+    YTNlOTgwZjM5ZTE4MWQ2OTg3YTc0MzZhMDdiMGE5YjIwN2I1Mjk=
   data.tar.gz: !binary |-
-    YTIyM2QxZDVkZjY0ODhlMTMwNjdmODMyOGYyMjViNDg3MjhhN2QyYmZjNzc3
-    MTJmNTAxODA0ZGNiZmJkZjVkYTRhYTEzYzc0ZjVjZWI3NTMxN2JhNjQxYTlj
-    ZTJkMzM4MmQyNTcwYjgyNjI1NzI2NWY1ZTFkYjgyYTE1YTUzN2Y=
+    ZmNmZmM4OGIyNDI0OWY0NGYxYmY4YTQxZmM0NDkyNmFmNmVmYjkwZDdhOWYy
+    MGU1ZDI5MzI1ZmQxNzBkOWNiMWQwNGYzNjk0YTI4YmYzZGI1NTcyZGEwMzgw
+    ZDM3MDFlNzM2YmZkOGQwMGMzMDE3MjI4NzczYzVhNzIyMTQ5OGE=

data/config/routes.rb

@@ -24,7 +24,7 @@ Foreman::Application.routes.draw do
     end
 
     if ForemanTasks.dynflow.required?
-      require 'dynflow/web_console'
+      require 'dynflow/web'
       mount ForemanTasks.dynflow.web_console => "/dynflow"
     end
   end

data/lib/foreman_tasks.rb

@@ -21,8 +21,7 @@ module ForemanTasks
     Match! async, true, false
 
     match trigger(action, *args, &block),
-          (on ::Dynflow::World::PlaningFailed.(error: ~any) |
-                  ::Dynflow::World::ExecutionFailed.(error: ~any) do |error|
+          (on ::Dynflow::World::PlaningFailed.(error: ~any) do |error|
             raise error
           end),
           (on ::Dynflow::World::Triggered.(execution_plan_id: ~any, future: ~any) do |id, finished|

data/lib/foreman_tasks/dynflow.rb

@@ -45,13 +45,7 @@ module ForemanTasks
 
           # don't try to do any rescuing until the tables are properly migrated
           if !Foreman.in_rake?('db:migrate') && (ForemanTasks::Task.table_exists? rescue(false))
-            # for now, we can check the consistency only when there
-            # is no remote executor. We should be able to check the consistency
-            # every time the new world is created when there is a register
-            # of executors
-            world.consistency_check
-            world.execute_planned_execution_plans
-
+            world.auto_execute
             ForemanTasks::Task::DynflowTask.consistency_check
           end
         end
@@ -87,7 +81,7 @@ module ForemanTasks
     end
 
     def web_console
-      ::Dynflow::WebConsole.setup do
+      ::Dynflow::Web.setup do
         before do
           if !Setting[:dynflow_enable_console] ||
                 (Setting[:dynflow_console_require_auth] && !ConsoleAuthorizer.new(env).allow?)

data/lib/foreman_tasks/dynflow/configuration.rb

@@ -18,10 +18,6 @@ module ForemanTasks
     attr_accessor :remote
     alias_method :remote?, :remote
 
-    # if remote set to true, use this path for socket communication
-    # between this process and the external executor
-    attr_accessor :remote_socket_path
-
     # what transaction adapater should be used, by default, it uses the ActiveRecord
     # based adapter, expecting ActiveRecord is used as ORM in the application
     attr_accessor :transaction_adapter
@@ -44,7 +40,6 @@ module ForemanTasks
       self.pool_size                = 5
       self.db_pool_size             = pool_size + 5
       self.remote                   = Rails.env.production?
-      self.remote_socket_path       = File.join(Rails.root, "tmp", "sockets", "dynflow_socket")
       self.transaction_adapter      = ::Dynflow::TransactionAdapters::ActiveRecord.new
       self.eager_load_paths         = []
       self.lazy_initialization      = !Rails.env.production?
@@ -58,7 +53,7 @@ module ForemanTasks
     end
 
     def initialize_world(world_class = ::Dynflow::World)
-      world_class.new(world_options).tap do |world|
+      world_class.new(world_config).tap do |world|
         @on_init.each { |init| init.call(world) }
       end
     end
@@ -98,12 +93,19 @@ module ForemanTasks
     protected
 
     # generates the options hash consumable by the Dynflow's world
-    def world_options
-      { logger_adapter:      ::Dynflow::LoggerAdapters::Delegator.new(action_logger, dynflow_logger),
-        pool_size:           5,
-        persistence_adapter: initialize_persistence,
-        transaction_adapter: transaction_adapter,
-        executor:            -> world { initialize_executor world } }
+    def world_config
+      ::Dynflow::Config.new.tap do |config|
+        config.auto_rescue         = true
+        config.logger_adapter      = ::Dynflow::LoggerAdapters::Delegator.new(action_logger, dynflow_logger)
+        config.pool_size           = 5
+        config.persistence_adapter = initialize_persistence
+        config.transaction_adapter = transaction_adapter
+        config.executor            = ->(world, _) { initialize_executor(world) }
+        config.connector           = ->(world, _) { initialize_connector(world) }
+
+        # we can't do any operation until the ForemanTasks.dynflow.world is set
+        config.auto_execute        = false
+      end
     end
 
     def default_sequel_adapter_options
@@ -125,12 +127,16 @@ module ForemanTasks
 
     def initialize_executor(world)
       if self.remote?
-        ::Dynflow::Executors::RemoteViaSocket.new(world, self.remote_socket_path)
+        false
       else
         ::Dynflow::Executors::Parallel.new(world, self.pool_size)
       end
     end
 
+    def initialize_connector(world)
+      ::Dynflow::Connectors::Database.new(world)
+    end
+
     # Sequel adapter based on Rails app database.yml configuration
     def initialize_persistence
       ForemanTasks::Dynflow::Persistence.new(default_sequel_adapter_options)

data/lib/foreman_tasks/dynflow/daemon.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 module ForemanTasks
   class Dynflow::Daemon
 
-    # load the Rails environment and initialize the executor and listener
+    # load the Rails environment and initialize the executor
     # in this thread.
     def run(foreman_root = Dir.pwd)
       STDERR.puts("Starting Rails environment")
@@ -13,10 +13,10 @@ module ForemanTasks
       end
       ForemanTasks.dynflow.executor!
       require foreman_env_file
-      STDERR.puts("Starting listener")
-      daemon = ::Dynflow::Daemon.new(listener, world, lock_file)
       STDERR.puts("Everything ready")
-      daemon.run
+      sleep
+    ensure
+      STDERR.puts("Exiting")
     end
 
     # run the executor as a daemon
@@ -54,35 +54,10 @@ module ForemanTasks
           exit 1
         end
       end
-      if command == "start" || command == "restart"
-        STDERR.puts('Waiting for the executor to be ready...')
-        options[:wait_attempts].times do |i|
-          STDERR.print('.')
-          if File.exists?(lock_file)
-            STDERR.puts('executor started successfully')
-            break
-          else
-            sleep options[:wait_sleep]
-          end
-        end
-      end
     end
 
     protected
 
-    def listener
-      FileUtils.mkdir_p(File.dirname(socket_path))
-      ::Dynflow::Listeners::Socket.new(world, socket_path)
-    end
-
-    def socket_path
-      ForemanTasks.dynflow.config.remote_socket_path
-    end
-
-    def lock_file
-      File.join(Rails.root, 'tmp', 'dynflow_executor.lock')
-    end
-
     def world
        ForemanTasks.dynflow.world
     end

data/lib/foreman_tasks/dynflow/persistence.rb

@@ -16,6 +16,8 @@ module ForemanTasks
           ForemanTasks.dynflow.world.logger.error(e.backtrace.join("\n"))
         end
       end
+    ensure
+      ::ActiveRecord::Base.clear_active_connections!
     end
 
     def on_execution_plan_save(execution_plan_id, data)

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.6.15"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.7.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement