pampa_dispatcher 1.1.2 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3fecfc8011a8887bdc3e98dc2337c8fd816c839
-  data.tar.gz: 27de7b420a6f87d2029abec0639cf7ba93bb165f
+  metadata.gz: 52492731329288d88868fa62bf58e49517f101f3
+  data.tar.gz: 394a19162ed3d00a91cbd91a7d9e868b8fdf5fa3
 SHA512:
-  metadata.gz: f6e3f31ddd0c2b2748ebb6d7b27cd3d49c89e5572152a2c8d3f6d794f056a20c1f79a958e32f65b8de95bb729984bdccd46d2d286513837aff64a1924253bb6e
-  data.tar.gz: 928f0a664d9f9c7ea8a9c783a9d3551d8f67275c744d4802d54e12c452220af8ee05fa1c6945efdfbe279315c1e52aa9b79b5f63d27d7f2f075c50d3c2d1289e
+  metadata.gz: 09c574706a73bb3371bd4b4060993ab50e4afa98c6f67c97868fd2c23eef90529690d74ddd42bc8aaeeb8edf28597254877e471f78052309ef74dd3bad3061c4
+  data.tar.gz: 47f68c81589d15decb37e3ffa9da92d1c1230001e440bce204925bbc4c13587abb41a10b2e5c98bd6f37819dbc2e4e70150dde446befcc75e6d34e3d3cc0e558

data/lib/pampa_dispatcher.rb

@@ -21,10 +21,10 @@ module BlackStack
     # max number of times that a record can start to process & fail (:start_time field is not nil, 
     # but :end_time field is still nil after :max_job_duration_minutes)
     attr_accessor :max_try_times
-    # additional function to decide how many records are pending for processing
-    # it should returns an integer
+    # additional function to returns an array of objects pending to be processed by a worker.
+    # it should returns an array
     # keep it nil if you want to run the default function
-    attr_accessor :ocuppied_function
+    attr_accessor :occupied_function
     # additional function to decide if the worker can dispatch or not
     # example: use this function when you want to decide based on the remaining credits of the client
     # it should returns true or false
@@ -63,34 +63,33 @@ module BlackStack
       self.queue_size = h[:queue_size]
       self.max_job_duration_minutes = h[:max_job_duration_minutes]  
       self.max_try_times = h[:max_try_times]
-      self.ocuppied_function = h[:ocuppied_function]
+      self.occupied_function = h[:occupied_function]
       self.allowing_function = h[:allowing_function]
       self.selecting_function = h[:selecting_function]
       self.relaunching_function = h[:relaunching_function]
       self.relauncher_function = h[:relauncher_function]
     end
     
-    # decide how many records are pending for processing
-    # it will count the number if records with :reservation_id == worker.id, and :start_time == nil
-    # it returns an integer
-    def ocuppied_slots(worker)
-      if self.ocuppied_function.nil?
-        return self.table.where(self.field_id.to_sym => worker.id, self.field_start_time.to_sym => nil).count if !self.field_start_time.nil?
-        return self.table.where(self.field_id.to_sym => worker.id).count if self.field_start_time.nil?
+    # returns an array of objects pending to be processed by the worker.
+    # it will select the records with :reservation_id == worker.id, and :start_time == nil
+    def occupied_slots(worker)
+      if self.occupied_function.nil?
+        return self.table.where(self.field_id.to_sym => worker.id, self.field_start_time.to_sym => nil).all if !self.field_start_time.nil?
+        return self.table.where(self.field_id.to_sym => worker.id).all if self.field_start_time.nil?
       else
         # TODO: validar que retorna un entero
-        return self.ocuppied_function.call(worker, self)
+        return self.occupied_function.call(worker, self)
       end
     end
 
     # returns the number of free slots in the procesing queue of this worker
     def available_slots(worker)
-      ocuppied = self.ocuppied_slots(worker)
+      occupied = self.occupied_slots(worker).size
       allowed = self.queue_size
-      if ocuppied > allowed
+      if occupied > allowed
         return 0
       else
-        return allowed - ocuppied
+        return allowed - occupied
       end
     end
 
@@ -116,7 +115,7 @@ module BlackStack
     end # selecting_dataset
 
     def selecting(worker, n)
-      if self.allowing_function.nil?
+      if self.selecting_function.nil?
         return self.selecting_dataset(worker, n).map { |o| o[self.field_primary_key.to_sym] }
       else
         # TODO: validar que retorna un array de strings
@@ -127,10 +126,13 @@ module BlackStack
     # choose the records to retry
     # returns an array of IDs
     def relaunching_dataset(worker, n)
-      ds = self.table.select(self.field_primary_key.to_sym).where("#{self.field_time.to_s} < '#{(Time.now - 60*self.max_job_duration_minutes.to_i).strftime('%Y-%m-%d %H:%M:%S').to_s}'")
+      ds = self.table.select(self.field_primary_key.to_sym).where("#{self.field_time.to_s} < DATEADD(mi, -#{self.max_job_duration_minutes.to_i}, GETDATE())")
       ds = ds.filter("#{self.field_end_time.to_s} IS NULL") if !self.field_end_time.nil?  
 #      ds = ds.filter("( #{self.field_times.to_s} IS NULL OR #{self.field_times.to_s} < #{self.max_try_times.to_s} ) ") if !self.field_times.nil?
       ds = ds.limit(n)
+puts
+puts "relaunching_dataset: #{ds.sql}"
+      ds
     end
 
     def relaunching(worker, n)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pampa_dispatcher
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.6
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -96,20 +96,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.24
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.24
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.24
 description: 'THIS GEM IS STILL IN DEVELOPMENT STAGE. Find documentation here: https://github.com/leandrosardi/pampa_dispatcher.'
 email: leandro.sardi@expandedventure.com
 executables: []