tasque 0.0.9 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29ec554927e3ba7e306961b983eba1d5d1e1e3734a473206babb678d94340a11
-  data.tar.gz: f063d33729ce3f9e785e4cd1c4b84027a0512721beda6de4b53b2689b740506b
+  metadata.gz: d919afb6bc2fa5747b40754ab02cca39d133720c776c221aa10ec47076871c54
+  data.tar.gz: 7db2cf33f6f3abb1756d8431cb484b8a47454d205f95ce8d0d8a327efefcda52
 SHA512:
-  metadata.gz: 89eb31d3b9d99263bd30d75235856982f9e894df6ad242a448112563918c76e304f8266a83211ae7e2449b1f4846dd69a872a94daab855b217eda2c14f87d73c
-  data.tar.gz: d6d99b0f65889aa0d7fd9661e07e707711a4c2fce1e4bef6f541419e86404c6745fbd008073e4b2e7a8f17911f14e32e79271116746383c963b0ca771f67c5c1
+  metadata.gz: 29a9b4665321655b28bd3578cdc1cb4d1903de294a09cc4898a217747c36b5a19c174e4dfbb57325b9d577aab7b9be95aa62966e7c17f3b23a416858e651dd3b
+  data.tar.gz: aeb0779c64ba42f480f8d761befd681e46d21e035d3f4fae063d200d8d3e0ad7358f69b26b7c360f25c93068b568ff7632ee72c4c3fc3f03ea169774644c055e

data/README.md

@@ -68,6 +68,9 @@ To enable this featute uncomment following lines in your tasque initializer:
     # Send worker heartbeat via Insque
     config.heartbeat = true
     config.heartbeat_interval = 10 # seconds
+
+    # Use RedisMutex instead of database transaction 
+    config.use_mutex = true
     
 
 ## Contributing

data/lib/tasque/configuration.rb

@@ -43,6 +43,9 @@ module Tasque
     attr_accessor :heartbeat_interval
     attr_accessor :heartbeat_payload
     attr_accessor :notify
+    attr_accessor :use_mutex
+    attr_accessor :mutex_name
+    attr_accessor :mutex_options
 
     def initialize
       self.environment = :development
@@ -54,6 +57,9 @@ module Tasque
       self.heartbeat_interval = 10 # seconds
       self.heartbeat_payload = {}
       self.notify = false
+      self.use_mutex = false
+      self.mutex_name = 'tasque_task_pickup'
+      self.mutex_options = {}
     end
     
     def database_file=(path)

data/lib/tasque/processor.rb

@@ -21,12 +21,12 @@ module Tasque
         rescue Tasque::TaskCancel => e
           task.cancel
         rescue Tasque::TaskError => e
-          task.error = {
+          task.result = {
             task_error: e.task_error
           }
           task.failure
         rescue Exception => e
-          task.error = {
+          task.result = {
             exception: e.message,
             backtrace: e.backtrace
           }
@@ -64,7 +64,8 @@ module Tasque
           heartbeat_timers.every(Tasque.config.heartbeat_interval) do
             message = {
               worker: Tasque.config.worker,
-              busy: !@current_task.nil?
+              busy: !@current_task.nil?,
+              current_task: @current_task.try(:id)
             }.merge(Tasque.config.heartbeat_payload)
             Insque.broadcast :heartbeat, message
           end

data/lib/tasque/task.rb

@@ -24,15 +24,24 @@ module Tasque
     validates :priority, numericality: { only_integer: true }
     
     class << self
+      def do_fetch(type)
+        minimum_priority = Tasque.config.minimum_priority
+        task = self.with_task(type).to_process.minimum_priority(minimum_priority).lock(true).first
+        if task and task.can_pickup?
+          task.pickup
+          task
+        end
+      end
+
       def fetch(type, &block)
         task = nil
-        transaction do
-          minimum_priority = Tasque.config.minimum_priority
-          task = self.with_task(type).to_process.minimum_priority(minimum_priority).lock(true).first
-          if task and task.can_pickup?
-            task.pickup
-          else
-            task = nil
+        if Tasque.config.use_mutex && defined?(RedisMutex)
+          RedisMutex.with_lock(Tasque.config.mutex_name, Tasque.config.mutex_options) do
+            task = do_fetch(type)
+          end
+        else
+          transaction do
+            task = do_fetch(type)
           end
         end
         yield(task) if task
@@ -67,7 +76,7 @@ module Tasque
       end
       
       after_transition on: :failure do |task|
-        task.update_columns attempts: (task.attempts + 1), result: { error: task.error }, progress: 0
+        task.update_columns attempts: (task.attempts + 1), progress: 0
       end
       
       after_transition on: :reprocess do |task|
@@ -94,7 +103,7 @@ module Tasque
       end
       
       event :reprocess do
-        transition [:processing, :complete, :error] => :reprocessed
+        transition [:processing, :complete, :error, :canceled] => :reprocessed
       end
       
       event :cancel do
@@ -112,15 +121,13 @@ 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, :cancel do
+      state :processing, :error do
         attr_accessor :error
 
         def error?

data/lib/tasque/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasque
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.2.2
 platform: ruby
 authors:
 - Yuri Gomozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord