dynflow 0.8.29 → 0.8.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52093e656e80afba8c3cfef6548c6abb978013af
-  data.tar.gz: 16d58712d8e3db65deb9f4c5f74a6f44d1fa4e0a
+  metadata.gz: d71060f0924aa889e0426c476d6b7cf9366475d3
+  data.tar.gz: 6008428d10eff1655d8554526e139a46ec2b68c4
 SHA512:
-  metadata.gz: aeb9f630d85d36e9800f85faaaffcae780aa6b00e5783b5a001aa94dbf4eac56ebc9574eeee8115de0aea5c86e3451735e4e57d4e31bf96aaf3bc7f7f8b05a9b
-  data.tar.gz: ec28ae5dc1222952d5d5676937889e7c2f247f279475c24a6c24656f806d1fff60c78351ef343727af5635defe5dc3936298823e9cb88540ac28b772544bf182
+  metadata.gz: bd3c82ba611cb82460817d6c5e3ac985a859b4dfb6499ab11508209e1d87605f4dee57340ac67825fb4ca78c7f49d00b66b71f2d7137d83292595fc4110f42ac
+  data.tar.gz: 5fda41ada7581f1601f407cfe093ed6f3e4d902923fdf27dbe6dbcc73a69f18ffcfd5db4afd105d88537e90e7ee38bd546eaed8caa40609b3ce184bb067ab590

data/lib/dynflow/config.rb

@@ -93,6 +93,10 @@ module Dynflow
       true
     end
 
+    config_attr :termination_timeout, Numeric do
+      60
+    end
+
     config_attr :auto_execute, Algebrick::Types::Boolean do
       true
     end

data/lib/dynflow/rails/configuration.rb

@@ -75,7 +75,7 @@ module Dynflow
       end
 
       def rake_task_with_executor?
-        return false unless defined?(::Rake)
+        return false unless defined?(::Rake) && ::Rake.respond_to?(:application)
 
         ::Rake.application.top_level_tasks.any? do |rake_task|
           rake_tasks_with_executor.include?(rake_task)

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.8.29'
+  VERSION = '0.8.30'
 end

data/lib/dynflow/world.rb

@@ -8,7 +8,7 @@ module Dynflow
                 :transaction_adapter, :logger_adapter, :coordinator,
                 :persistence, :action_classes, :subscription_index,
                 :middleware, :auto_rescue, :clock, :meta, :delayed_executor, :auto_validity_check, :validity_check_timeout, :throttle_limiter,
-                :terminated, :dead_letter_handler, :execution_plan_cleaner
+                :termination_timeout, :terminated, :dead_letter_handler, :execution_plan_cleaner
 
     def initialize(config)
       @id                     = SecureRandom.uuid
@@ -35,6 +35,7 @@ module Dynflow
       @validity_check_timeout = config_for_world.validity_check_timeout
       @throttle_limiter       = config_for_world.throttle_limiter
       @terminated             = Concurrent.event
+      @termination_timeout    = config_for_world.termination_timeout
       calculate_subscription_index
 
       if executor
@@ -217,35 +218,35 @@ module Dynflow
 
             if delayed_executor
               logger.info "start terminating delayed_executor..."
-              delayed_executor.terminate.wait
+              delayed_executor.terminate.wait(termination_timeout)
             end
 
             logger.info "start terminating throttle_limiter..."
-            throttle_limiter.terminate.wait
+            throttle_limiter.terminate.wait(termination_timeout)
 
             if executor
               connector.stop_receiving_new_work(self)
 
               logger.info "start terminating executor..."
-              executor.terminate.wait
+              executor.terminate.wait(termination_timeout)
 
               logger.info "start terminating executor dispatcher..."
               executor_dispatcher_terminated = Concurrent.future
               executor_dispatcher.ask([:start_termination, executor_dispatcher_terminated])
-              executor_dispatcher_terminated.wait
+              executor_dispatcher_terminated.wait(termination_timeout)
             end
 
             logger.info "start terminating client dispatcher..."
             client_dispatcher_terminated = Concurrent.future
             client_dispatcher.ask([:start_termination, client_dispatcher_terminated])
-            client_dispatcher_terminated.wait
+            client_dispatcher_terminated.wait(termination_timeout)
 
             logger.info "stop listening for new events..."
             connector.stop_listening(self)
 
             if @clock
               logger.info "start terminating clock..."
-              clock.ask(:terminate!).wait
+              clock.ask(:terminate!).wait(termination_timeout)
             end
 
             coordinator.delete_world(registered_world)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.29
+  version: 0.8.30
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json