pampa_dispatcher 1.1.1 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 854adb6af15723ba6c9a2f4ac5af8acc8a47f4ba
-  data.tar.gz: 11091e316eab1a12bfb30114269ea612693aa59a
+  metadata.gz: 2c1dc9cc0ade4f72c76c703576a5af20acc84138
+  data.tar.gz: 0ed72d048112a98c3b4e35db65781a7e29f34428
 SHA512:
-  metadata.gz: a89cd5510431a901f9677bd35cceabcf20d281e0d514f1063cc83c514335a6998ae14109ea15078e455d61853ac63358bbc0ee86a7a637b5fe4faff5bc81ab82
-  data.tar.gz: 324445697c97efa5ed2089e43326a9363165a7d7db044929d07eacf9834cbf3c2526bfb56d7b77e1475196f058c350d92aa6cabab8ac895c3250b23b8e7a3bbc
+  metadata.gz: c42f4220c1290e1dead31f9ab25cf0286d352da5c907122b62f47290832401ab3233726c371c1aa665da1414f5447e2bbb17d46064b2dae385ec3f01020ba80b
+  data.tar.gz: 516b95b3c8e461a629d08ea7534d7cd80ac294287e0305bb22899d4147891f83db34cceb0d294f9e1f3971fb3be15869774746edd3c8bea317a8d37bdd1431d0

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
@@ -153,7 +152,7 @@ module BlackStack
     def start(o)
       if self.starter_function.nil?
         o[self.field_start_time.to_sym] = now() if !self.field_start_time.nil?
-        o[self.field_times.to_sym] = o[self.field_times.to_sym].to_i + 1 if !self.field_times.nil?
+        o[self.field_times.to_sym] = o[self.field_times.to_sym].to_i + 1
         o.save
       else
         self.starter_function.call(o, self)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pampa_dispatcher
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.5
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2021-11-01 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: []