tanga_que_extensions 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c78c9eff18224f0e67bcd590d61853fa71878255
-  data.tar.gz: c29b06e03dd3fdd039c9f5be1fb366ce929b7331
+  metadata.gz: 9aae367072232fd5da235b0aa176823cbb84fed0
+  data.tar.gz: 33b0388eca8e5cbd44cbb4eddabe35667507f7ca
 SHA512:
-  metadata.gz: 9efa163c9bc22da4ce42d3c1771fca510194cddd55a8b20cce42e091c71e08bd0fdf9a9227f5c9ad5ab97c921a1642c9513ad39171daf63a63a845011a86ff58
-  data.tar.gz: 47f38d7cbb66477e3d70419eda7e2a7b9e97ae9e4e6d0d402f02964533db618ef93a33c664a816c0108a94d764b32404c859d405b168cfedcd0ea54b3130a650
+  metadata.gz: 154e6b003b0b5497f4fa656eb12a548adf51fd3ac4c20e4cd72045ac6a4394f653b25bd406dd29f9f42978e538a91614063fe88ec5887be2405f85e015568063
+  data.tar.gz: 8b577e258ffa815885c61bc1dcc192ad1a828f9e7026ff6defd6727ee40306f7d5ab2e57aa8605e429dcba5df939373b626ecfcddfd5ff8d3bbe0bb443e7e9c9

data/lib/child_job.rb

@@ -0,0 +1,12 @@
+module Que::ChildJob
+  def enqueue(*args)
+    Que.transaction do
+      job_data = super
+
+      parent_job_id = args.first[:parent_job_id] rescue nil
+      if parent_job_id.present?
+        QueJob.where(job_id: job_data.attrs['job_id']).update_all(parent_job_id: parent_job_id)
+      end
+    end
+  end
+end

data/lib/jobs/watch_child_jobs.rb

@@ -0,0 +1,12 @@
+module Jobs
+  class WatchChildJobs < Que::Job
+    def run(options)
+      unless QueJob.where(parent_job_id: options[:job_id]).count > 0
+        QueJobStatus.where(job_id: options[:job_id]).update_all(finished_at: Time.now, status: 'finished')
+        return
+      end
+
+      self.class.enqueue(options.merge(run_at: Time.current + 1.second))
+    end
+  end
+end

data/lib/record_job_status_to_parent_job.rb

@@ -0,0 +1,23 @@
+module Que::RecordJobStatusToParentJob
+  def parent_job_id
+    @attrs['args'].first['parent_job_id'] || 0
+  rescue
+    0
+  end
+
+  def update_job_data(job_data)
+    super if defined?(super)
+
+    parent_job_scope.find_each do |parent_job|
+      parent_job.with_lock do
+        parent_job.job_data = [] unless parent_job.job_data.kind_of?(Array)
+        parent_job.job_data << job_data
+        parent_job.save!
+      end
+    end
+  end
+
+  def parent_job_scope
+    QueJobStatus.where(job_id: parent_job_id)
+  end
+end

data/lib/tanga_que_extensions.rb

@@ -10,3 +10,7 @@ require_relative 'que_job'
 require_relative 'que_job_status'
 require_relative 'set_application_name_when_job_runs'
 require_relative 'prevent_duplicates'
+require_relative 'wait_for_child_jobs'
+require_relative 'record_job_status_to_parent_job'
+require_relative 'jobs/watch_child_jobs'
+require_relative 'child_job'

data/lib/wait_for_child_jobs.rb

@@ -0,0 +1,6 @@
+module Que::WaitForChildJobs
+  def record_job_finished
+    job_scope.update_all(status: 'waiting-for-child-jobs')
+    Jobs::WatchChildJobs.enqueue(job_id: job_id)
+  end
+end

data/test/test_child_jobs.rb

@@ -0,0 +1,43 @@
+require 'active_support'
+require 'active_support/core_ext'
+require 'json'
+require 'logger'
+require 'active_record'
+require_relative '../lib/tanga_que_extensions'
+
+require 'pry'
+
+ActiveRecord::Base.establish_connection 'postgres://localhost/channel_advisor_dev'
+Que.connection = ActiveRecord
+
+ActiveRecord::Base.logger = Logger.new($stdout)
+
+class Child < Que::Job
+  prepend Que::ChildJob
+  prepend Que::RecordJobStatus
+  prepend Que::RecordJobStatusToParentJob
+
+  def run(args)
+    sleep(args[:i])
+    update_job_data(args)
+  end
+end
+
+class Parent < Que::Job
+  prepend Que::RecordJobStatus
+  prepend Que::WaitForChildJobs
+
+  def run(args)
+    5.times do |i|
+      Child.enqueue(i: i, parent_job_id: job_id)
+    end
+  end
+end
+
+QueJob.delete_all
+QueJobStatus.delete_all
+Que.logger = Logger.new(STDOUT)
+Que.mode = :async
+
+Parent.enqueue
+gets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanga_que_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Joe Van Dyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que
@@ -88,6 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/background_job_logger.rb
+- lib/child_job.rb
+- lib/jobs/watch_child_jobs.rb
 - lib/memory_info.rb
 - lib/notify_on_failures.rb
 - lib/periodic_job.rb
@@ -95,9 +97,12 @@ files:
 - lib/que_job.rb
 - lib/que_job_status.rb
 - lib/record_job_status.rb
+- lib/record_job_status_to_parent_job.rb
 - lib/set_application_name_when_job_runs.rb
 - lib/tanga_que_extensions.rb
+- lib/wait_for_child_jobs.rb
 - test/test.rb
+- test/test_child_jobs.rb
 homepage: https://www.tanga.com
 licenses: []
 metadata: {}
@@ -117,9 +122,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: job scheduling stuff for tanga
 test_files:
+- test/test_child_jobs.rb
 - test/test.rb