capistrano_multiconfig_parallel 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e6f19bd4a7bf784e65f3bc34d3e49bb9e09cbe0
-  data.tar.gz: 69ce6bff1ffa9bb244ee9c12e6a035850c458be5
+  metadata.gz: f5a35a7ede67c601da4e663947e5e58fb0e83065
+  data.tar.gz: 9307b72fb8716cf0117307eb5d9a5c86169b5601
 SHA512:
-  metadata.gz: 500a0d5722c22bc3d00abfedd395050a7ce693fd9eec858cb4fc5d4f6ef82c62ce782b5cfb15aa6426fabf284f54dc4f0d3f1baee62b3ee00909ce74cfe41fbf
-  data.tar.gz: 7be10e250b4ed0e1c3990e4071816203022b0b7b20d34a8f60a1a1d475ec469b8ffd6a782b976e2e47fa193a80944c6276ea1f4e668c54a17225555875e202a5
+  metadata.gz: 4ac2faaeabb21aae54db13122d077fd0a93d973fd172f54bd38c12d75fbbaa28f035eba4da08f643ad977e01f97300d45fa046ff6c0e986fa690e3d03277b046
+  data.tar.gz: dc6cbf259342a4f4e44e663e97a41b7295cb42286fb164f0780de80c4e631348b156fe74bcf5b5e778d92f049cb874ed956afbac76681fa0cec6a1d03eaa486b

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -56,9 +56,12 @@ module CapistranoMulticonfigParallel
     def enable_logging
       CapistranoMulticonfigParallel.configuration_valid?
       return unless CapistranoMulticonfigParallel::CelluloidManager.debug_enabled
-      FileUtils.mkdir_p(log_directory)
-      log_file = File.open(main_log_file, 'w')
-      log_file.sync = true
+      FileUtils.mkdir_p(log_directory) unless  File.directory?(log_directory)
+      FileUtils.touch(main_log_file) unless File.file?(main_log_file)
+      if  ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
+        log_file = File.open(main_log_file, 'w')
+        log_file.sync = true
+      end
       self.logger = ::Logger.new(main_log_file)
       Celluloid.logger = logger
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -90,32 +90,52 @@ module CapistranoMulticonfigParallel
     end
 
     def process_jobs(&block)
-      @job_to_worker.pmap do |_job_id, worker|
+      @job_to_worker.pmap do |job_id, worker|
+        setup_worker_conditions(job_id)
         worker.async.start_task
       end
-      if block_given?
-        block.call
-      else
-        wait_task_confirmations
+      block_given? ? block.call : wait_task_confirmations
+      until  @job_to_worker.all?{|job_id, worker| worker.alive? && worker.worker_state =='finished'}
+        sleep(0.1) # keep current thread alive
       end
-      results2 = []
-      @job_to_condition.pmap do |_job_id, hash|
-        results2 << hash[:last_condition].wait
+      mark_completed_remaining_tasks
+      @job_manager.condition.signal("completed") 
+    end
+    
+    def setup_worker_conditions(job_id)
+      hash_conditions = {}
+      if need_confirmations?
+        CapistranoMulticonfigParallel.configuration.task_confirmations.each do |task|
+          hash_conditions[task] = { condition:  Celluloid::Condition.new, status: 'unconfirmed' }
+        end
       end
-      @job_manager.condition.signal(results2) if results2.size == @jobs.size
+      @job_to_condition[job_id] = hash_conditions
     end
 
     def need_confirmations?
       CapistranoMulticonfigParallel.configuration.task_confirmation_active.to_s.downcase == 'true'
     end
     
+    def mark_completed_remaining_tasks
+      return unless need_confirmations?
+      CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, index|
+        @jobs.pmap do |job_id, _job|
+          fake_result = proc{ |sum| sum }
+          task_confirmation = @job_to_condition[job_id][task]
+          if task_confirmation[:status] != 'confirmed'
+            task_confirmation[:status] = 'confirmed'
+            task_confirmation[:condition].signal(fake_result)
+          end
+        end
+      end
+    end
+    
     def wait_task_confirmations
       return unless need_confirmations?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, index|
         results = []
         @jobs.pmap do |job_id, _job|
-          current_job = @job_to_condition[job_id][:first_condition][index]
-          result = current_job.respond_to?(:wait) ? current_job.wait : current_job
+          result = @job_to_condition[job_id][task][:condition].wait
           results << result
         end
         if results.size == @jobs.size
@@ -124,6 +144,7 @@ module CapistranoMulticonfigParallel
       end
     end
 
+    
     def confirm_task_approval(results, task)
       return unless results.present?
       if results.detect {|x| !x.is_a?(Proc)}

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -23,19 +23,19 @@ module CapistranoMulticonfigParallel
     class TaskFailed < StandardError; end
 
     attr_accessor :job, :manager, :job_id, :app_name, :env_name, :action_name, :env_options, :machine, :client, :task_argv, :execute_deploy, :executed_dry_run,
-                  :rake_tasks, :current_task_number, # tracking tasks
-                  :successfull_subscription, :subscription_channel, :publisher_channel, # for subscriptions and publishing events
-                  :task_confirmations, :manager_condition, :last_manager_condition # for task conifirmations from manager
+      :rake_tasks, :current_task_number, # tracking tasks
+    :successfull_subscription, :subscription_channel, :publisher_channel, # for subscriptions and publishing events
+    :job_termination_condition, :worker_state
 
     def work(job, manager)
       @job = job
+      @worker_state = 'started'
       @manager = manager
-
+      @job_confirmation_conditions = []
       process_job(job) if job.present?
       debug("worker #{@job_id} received #{job.inspect}") if debug_enabled?
       @subscription_channel = "worker_#{@job_id}"
       @machine = CapistranoMulticonfigParallel::StateMachine.new(job, Actor.current)
-      setup_worker_condition
       manager.register_worker_for_job(job, Actor.current)
     end
 
@@ -45,7 +45,6 @@ module CapistranoMulticonfigParallel
 
     def start_task
       debug("exec worker #{@job_id} starts task with #{@job.inspect}") if debug_enabled?
-      @task_confirmations = CapistranoMulticonfigParallel.configuration.task_confirmations
       @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: @manager.class.debug_websocket?) do |ws|
         ws.subscribe(@subscription_channel)
       end
@@ -124,8 +123,10 @@ module CapistranoMulticonfigParallel
     end
 
     def task_approval(message)
-      if @task_confirmations.include?(message['task']) && message['action'] == 'invoke'
-        @manager_condition[message['task']].call(message['task'])
+      if CapistranoMulticonfigParallel.configuration.task_confirmations.include?(message['task']) && message['action'] == 'invoke'
+        task_confirmation = @manager.job_to_condition[@job_id][message['task']]
+        task_confirmation[:status] = 'confirmed'
+        task_confirmation[:condition].signal(message['task'])
       else
         publish_rake_event(message.merge('approved' => 'yes'))
       end
@@ -181,43 +182,6 @@ module CapistranoMulticonfigParallel
       @task_arguments = job['task_arguments']
     end
 
-    def need_confirmation_for_tasks?
-      executes_deploy? == true  && @manager.need_confirmations?
-    end
-
-    def executes_deploy?
-      (@action_name == 'deploy' || @action_name == 'deploy:rollback')
-    end
-
-    def setup_worker_condition
-      job_termination_condition = Celluloid::Condition.new
-      job_confirmation_conditions = []
-      CapistranoMulticonfigParallel.configuration.task_confirmations.each do |_task|
-        if need_confirmation_for_tasks?
-          job_confirmation_conditions << Celluloid::Condition.new
-        else
-          job_confirmation_conditions << proc { |sum| sum }
-        end
-      end
-      @manager.job_to_condition[@job_id] = { first_condition: job_confirmation_conditions, last_condition: job_termination_condition }
-      construct_blocks_for_conditions(job_confirmation_conditions, job_termination_condition)
-    end
-
-    def construct_blocks_for_conditions(job_confirmation_conditions, job_termination_condition)
-      hash_conditions = {}
-      CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, index|
-        blk = lambda do |sum|
-          need_confirmation_for_tasks? ? job_confirmation_conditions[index].signal(sum) : job_confirmation_conditions[index].call(sum)
-        end
-        hash_conditions[task] = blk
-      end
-      blk_termination = lambda do |sum|
-        job_termination_condition.signal(sum)
-      end
-      @manager_condition = hash_conditions
-      @last_manager_condition = blk_termination
-    end
-
     def crashed?
       @action_name == 'deploy:rollback'
     end
@@ -225,13 +189,21 @@ module CapistranoMulticonfigParallel
     def notify_finished(exit_status)
       return unless @execute_deploy
       if exit_status.exitstatus != 0
-        debug("worker #{job_id} tries to terminate")
+        debug("worker #{job_id} tries to terminate") if debug_enabled?
         terminate
       else
         update_machine_state('FINISHED')
-        debug("worker #{job_id} notifies manager has finished")
-        @last_manager_condition.call('yes')
+        debug("worker #{job_id} notifies manager has finished") if debug_enabled?
+        @worker_state = "finished"
+        if debug_enabled?
+          debug("worker #{job_id}has state #{@worker_state}") 
+          @manager.job_to_worker.each{|job_id, worker| 
+            debug("worker #{worker.job_id}has state #{worker.worker_state}") if   worker.alive? 
+          }
+        end
       end
     end
+    
+    
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -6,14 +6,6 @@ module CapistranoMulticonfigParallel
 
     attr_accessor :actor, :pid, :exit_status, :process, :filename,:worker_log
 
-    def finalize
-      EM.stop
-      @timer.cancel
-      super
-      true
-    end
-
-    alias_method :terminate, :finalize
 
     def work(cmd, options = {})
       @options = options

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -10,7 +10,6 @@ module CapistranoMulticonfigParallel
       if $stdout.isatty
         $stdout.sync = true
       end
-      CapistranoMulticonfigParallel.enable_logging
       CapistranoMulticonfigParallel::Application.new.run
     rescue Interrupt
       `stty icanon echo`

data/lib/capistrano_multiconfig_parallel/helpers/base_manager.rb

@@ -13,6 +13,7 @@ module CapistranoMulticonfigParallel
       @top_level_tasks = top_level_tasks
       @stages = stages
       @jobs = []
+      CapistranoMulticonfigParallel.enable_logging
       CapistranoMulticonfigParallel.configuration_valid?
       CapistranoMulticonfigParallel.verify_app_dependencies(@stages) if CapistranoMulticonfigParallel.configuration.track_dependencies
     end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 1
-    TINY = 4
+    MINOR = 2
+    TINY = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - bogdanRada