tasque 0.0.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 195d58497012018a87a662d83b8ba48e6bdbd87a353221b2e18ad0727b4a410f
-  data.tar.gz: b84b4b12087e49444e6e6f4423bd16cd2ed772d8e1e056b9d0a732a609751114
+  metadata.gz: 2adca1cf5596d7229bd6a0cb56b807182a5f1f4dfdca4ae59f9fe05afce366f5
+  data.tar.gz: db94c3ec281ae6f81058450e95be5193394f93523ef3c878f690a763c5af1e31
 SHA512:
-  metadata.gz: 9c8e7b68fbc85dbfd1fa172307a1fec24c23d4fe4a505a30a1e24a280da00830bdf8bab5ce2985fe79b5257a77129c456079a0d78b740e8f6581ea11686d6acc
-  data.tar.gz: d95f5e11bcb7b481faa0f6d36327e931b43e34ff362a0484a21dcd8f1b8f8d7c215eb7d631383e583c007179dbab2085e5ca872fc5b3880eada87ccf9c7dc2f9
+  metadata.gz: dcfa37f5e4e0a948b97a5baa5ea1191148dce17c1b6c82e498204d51d03b47e49be3ac9839e17ff8694ecb8cc4ce338d4592ec2f6087366a64d015c9f65a5a7f
+  data.tar.gz: 112812610a7b965ebe97925e10e545ab04cc41ff2e3e591378695a7869e35bbc33ce720b0724c07f412315cd8a5e3e4ccfd4011479a0ab27ba865b560c958d31

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_job.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.heartbeat && 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
@@ -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/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.7"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasque
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuri Gomozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2020-11-17 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