tasque 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3623a9472c224a0ede6dd977f6a9d676f65ccd4f6ab961ef275048a9313b78f5
-  data.tar.gz: be4b5a7a8fe9fb387d5f07d12158290cd895838460cee7fa91e33d3bb21841ff
+  metadata.gz: 2adca1cf5596d7229bd6a0cb56b807182a5f1f4dfdca4ae59f9fe05afce366f5
+  data.tar.gz: db94c3ec281ae6f81058450e95be5193394f93523ef3c878f690a763c5af1e31
 SHA512:
-  metadata.gz: ec9753f522a63f78331d0716770668ce925208fa40a692606f1690f0dad236debba82b72cbcf96def777100d985e748c5086771a1cd6f2315a14156a7f2aa2d2
-  data.tar.gz: 371f4a88cdf4b26aa144ec01dd9159c6686ded749556952e715bfcde68818bb4476afe12d193ab3da538ac4527463620738c1c0847030d54f8963c53069640a9
+  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

@@ -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.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

data/lib/tasque/version.rb

@@ -1,3 +1,3 @@
 module Tasque
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasque
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuri Gomozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord