tasque 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0b5935e1d4982bf36d127324ed8f3846b577c2ddacf031a339360626203e23
-  data.tar.gz: 64988b1ffc2200d333b289791978106686a04dd85fdb027b9bef62c5c0c4fb74
+  metadata.gz: 29ec554927e3ba7e306961b983eba1d5d1e1e3734a473206babb678d94340a11
+  data.tar.gz: f063d33729ce3f9e785e4cd1c4b84027a0512721beda6de4b53b2689b740506b
 SHA512:
-  metadata.gz: 91853cbce23866722d4c39e7d045397d449b4078bd8e9902a7a1a823ef635f2721968f270e628b2060de7886ad03dd70c3d2147a6b85070f079de08b65ac7d71
-  data.tar.gz: 242a113c684536ab53dcf988b6ee3ddd95586b64cbbbceda4c5fede237950d19f8429719b6fbb85a4aa790cf9a2dd15efc96b65863eb1e783914ec9c240eb262
+  metadata.gz: 89eb31d3b9d99263bd30d75235856982f9e894df6ad242a448112563918c76e304f8266a83211ae7e2449b1f4846dd69a872a94daab855b217eda2c14f87d73c
+  data.tar.gz: d6d99b0f65889aa0d7fd9661e07e707711a4c2fce1e4bef6f541419e86404c6745fbd008073e4b2e7a8f17911f14e32e79271116746383c963b0ca771f67c5c1

data/lib/tasque.rb

@@ -3,6 +3,7 @@ require "active_record"
 require "tasque/configuration"
 require "tasque/task"
 require "tasque/task_error"
+require "tasque/task_cancel"
 require "tasque/processor"
 require "tasque/version"
 

data/lib/tasque/configuration.rb

@@ -41,6 +41,7 @@ module Tasque
     attr_accessor :worker
     attr_accessor :heartbeat
     attr_accessor :heartbeat_interval
+    attr_accessor :heartbeat_payload
     attr_accessor :notify
 
     def initialize
@@ -51,6 +52,7 @@ module Tasque
       self.progress_interval = 5 # seconds
       self.heartbeat = false
       self.heartbeat_interval = 10 # seconds
+      self.heartbeat_payload = {}
       self.notify = false
     end
     

data/lib/tasque/processor.rb

@@ -17,17 +17,21 @@ module Tasque
         task.process
         begin
           task.result = block.call task
+          task.complete
+        rescue Tasque::TaskCancel => e
+          task.cancel
         rescue Tasque::TaskError => e
           task.error = {
             task_error: e.task_error
           }
+          task.failure
         rescue Exception => e
           task.error = {
             exception: e.message,
             backtrace: e.backtrace
           }
+          task.failure
         end
-        task.error? ? task.failure : task.complete
         @current_task = nil
       end
       @timers.every(check_interval) do
@@ -60,8 +64,8 @@ module Tasque
           heartbeat_timers.every(Tasque.config.heartbeat_interval) do
             message = {
               worker: Tasque.config.worker,
-              busy: !@current_job.nil?
-            }
+              busy: !@current_task.nil?
+            }.merge(Tasque.config.heartbeat_payload)
             Insque.broadcast :heartbeat, message
           end
           loop do

data/lib/tasque/task.rb

@@ -11,7 +11,7 @@ module Tasque
     serialize :params, JSON
     serialize :result, JSON
     
-    scope :with_task, ->(task) { where(task: task).order priority: :desc }
+    scope :with_task, ->(task) { where(task: task).order priority: :desc, created_at: :asc }
     scope :minimum_priority, ->(priority) { priority.nil? ? nil : where('priority >= ?', priority) }
     scope :to_process, -> { where status: %w(new reprocessed) }
     scope :with_error, -> { where status: 'error' }
@@ -98,7 +98,7 @@ module Tasque
       end
       
       event :cancel do
-        transition any - [:processing] => :canceled
+        transition any => :canceled
       end
       
       
@@ -112,13 +112,15 @@ module Tasque
           @last_progress_val = val
           notify
         end
-        
+      end
+       
+      state :processing, :cancel do 
         def error!(task_error)
           raise Tasque::TaskError.new(self, task_error)
         end
       end
       
-      state :processing, :error do
+      state :processing, :error, :cancel do
         attr_accessor :error
 
         def error?

data/lib/tasque/task_cancel.rb

@@ -0,0 +1,10 @@
+module Tasque
+  class TaskCancel < Exception
+    attr_reader :task
+  
+    def initialize(task)
+      @task = task
+    end
+  end
+end
+

data/lib/tasque/version.rb

@@ -1,3 +1,3 @@
 module Tasque
-  VERSION = "0.0.4"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasque
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 platform: ruby
 authors:
 - Yuri Gomozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -144,6 +144,7 @@ files:
 - lib/tasque/configuration.rb
 - lib/tasque/processor.rb
 - lib/tasque/task.rb
+- lib/tasque/task_cancel.rb
 - lib/tasque/task_error.rb
 - lib/tasque/version.rb
 - spec/spec_helper.rb
@@ -167,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord based task queue