tasque 0.0.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49877f4056f63093fc82edb1ff458450fbadbc6113e149d083a503b9dbf9fdb6
-  data.tar.gz: 5fd3def76f080fa3753df861b8ba18ef487c9acee86452677b6d95260e151c94
+  metadata.gz: 2c9c5386eca9d4aedb84a0773426bd260b984a02a592f4fe9428709b1f29bd63
+  data.tar.gz: 4225237ce895f974925907def2be136547eab2cf7710c99c5dd24f1bc4c1718c
 SHA512:
-  metadata.gz: a197f5b667afec439400a53e1620dbba5379b79f780cca10d7dfe80837b0847c224277f4b0b15426ad8df5fd50d1b963ebb2b0d9d8ac8322502b0ce27f090593
-  data.tar.gz: 3a4838dd99a0186ead764d6b1bd401b97072fbd81a4d077e86de8e54c3120c7bd03101ddaea0bbfc93159fe3d7cc307da1a67f867926822c760e2c3b233686f2
+  metadata.gz: 0cde35ce60a6aae7336e5dd5f2e6c9d1f0a88e841757b924397dc9922cf1a75ad677ab3ef412c3399edf5fdd57ee8c8785b28bfcae26ca53ceb4c9428b85aeaa
+  data.tar.gz: 9700940b5c9c91f49f25bd402a4c4216fd4d83b41b0d88e44a2fb9fd830b61002e1eb0277dd77f802433ef2fc40159daa6faf54e8c6fb28226eb1d56d8f8078b

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.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
@@ -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.0.8"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasque
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.2.1
 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