tasque 0.1.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b70e30c7ee126d2f6198b70ee8357a32d09f26689732921bc68a4a83eb7aec8f
-  data.tar.gz: 31cfcf34f77c7bce166f22d9b49e34baa604dbe168ec22c7e577f045f5da8e8e
+  metadata.gz: 3e0aa3ee8ae602fce82d671394aa1e327455cbe64c3bcbc6fb0d32ed426badfb
+  data.tar.gz: 118892e49921e670bed7fc2ebb54ffaca07cf0e06f30e408581395c554cac910
 SHA512:
-  metadata.gz: 3cd5328d0d63119f7f5877cc886162962c8a6e087e72749c0d2ed4b5f8fc6998a7a0706755126feb0cb84bf9a3fb6e2f549d0942e25edc27ef42f5a32386cd38
-  data.tar.gz: 2e564a2607dadfde24e6b532251a41505cf30484b0a89ba94cba482a9deeb067f53b82c92b830ae4819aa407c81aeb009a056048b6bf47490f04189001879a4c
+  metadata.gz: 6ad4d8347c052f8c8556ff01702d23104ddf1a2b4c417766f4cbd196954bf3ec1956c0ddb7debe3afa1913edf791e8b2d19d65af27255af4d6498fb20cd3c83f
+  data.tar.gz: 6c828471ccf97439d90ae6e48398da32da7bfb968d7f4d097d0320e55ecdc2d3e6bd9e4bc201e42ebb8003cc1548ce68af842deac05d20a61c2a3799bd65c126

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

@@ -39,7 +39,7 @@ module Tasque
           has_task = Tasque::Task.fetch(type) do |task|
             @handlers[type.to_sym].call(task)
           end
-        rescue ActiveRecord::Deadlocked
+        rescue ActiveRecord::Deadlocked, ActiveRecord::LockWaitTimeout
           retry
         end while has_task
       end
@@ -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

data/lib/tasque/version.rb

@@ -1,3 +1,3 @@
 module Tasque
-  VERSION = "0.1.0"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasque
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Yuri Gomozov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2021-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -153,7 +153,7 @@ files:
 homepage: https://github.com/Gropher/tasque
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: ActiveRecord based task queue
 test_files: