pampa 2.0.22 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac993919e389d035833b9af112fa4c862828a109fa5dda16c4980b0146253657
-  data.tar.gz: 2bb9d6b46de53aff50880e5bd7840840c96e5f5cf1229156bca4555668038745
+  metadata.gz: 92d7d8df1f5429f04a8e618621aecb004057ee16b6282cb41634b3a9864d382d
+  data.tar.gz: ea014735d0b0bb639ecae88c6c0e63ce693651eae54e6f3d42c168e76eafe6f4
 SHA512:
-  metadata.gz: d3168176acff1fcedec4dfe367721aa2bb0db49c165c0a3ddfbb5dfeabefbe8cee372798350ae7ad8b0df2538026fcff60b2755951718c0357f3af7efaa4adc4
-  data.tar.gz: 45d00ba3b0fcdf27ed771806dbb26a14d14a721c62702c8f04f5a1c4a02cda894920043d24c93f3f3d55bcbbb134191231ccfafedeef4ab833b295c9dedcf459
+  metadata.gz: f74a6781dfa581dc1fa8ce821cffa19e344e5e50ba1354c581fc03f5961913f1ee7d284a29df265acc94debf440bf0727502e47a277d0472369468f4d0414ed9
+  data.tar.gz: fcea0f7f2bd298581c4d0e82264b21d85060176afc0f31a79eb8a8f2e5a33362e89315fc9d14e385bcdb163ecb82af4755c87d55905e8d8751902cbf983f7300

data/lib/pampa.rb

@@ -289,7 +289,7 @@ module BlackStack
             l = self.logger()
             # iterate the workers
             BlackStack::Pampa.workers.each { |worker|
-                l.logs("worker:#{worker.id}... ")
+                l.logs("worker:#{worker.id} (job:#{worker.assigned_job.to_s})... ")
                 if !worker.attached
                   l.logf("detached")
                 else
@@ -790,8 +790,7 @@ module BlackStack
               q = "
                 SELECT * 
                 FROM #{self.table.to_s} 
-                WHERE #{self.field_time.to_s} IS NOT NULL 
-                AND #{self.field_time.to_s} < CAST('#{BlackStack::Pampa.now}' AS TIMESTAMP) - INTERVAL '#{self.max_job_duration_minutes.to_i} minutes' 
+                WHERE COALESCE(#{self.field_time.to_s}, '1900-01-01') < CAST('#{BlackStack::Pampa.now}' AS TIMESTAMP) - INTERVAL '#{self.max_job_duration_minutes.to_i} minutes' 
                 AND #{self.field_id.to_s} IS NOT NULL 
                 AND #{self.field_end_time.to_s} IS NULL
                 AND COALESCE(#{self.field_times.to_s},0) < #{self.max_try_times.to_i}
@@ -814,6 +813,7 @@ module BlackStack
               q = "
                 UPDATE #{self.table.to_s}
                 SET
+                  #{self.field_id.to_s} = #{o[self.field_id.to_sym].nil? ? 'NULL' : "'#{o[self.field_id.to_sym]}'"},
                   #{self.field_time} = #{o[self.field_time.to_sym].nil? ? 'NULL' : "'#{o[self.field_time.to_sym].to_s}'"},
                   #{self.field_times} = #{o[self.field_times.to_sym].to_i},
                   #{self.field_start_time} = #{o[self.field_start_time.to_sym].nil? ? 'NULL' : "'#{o[self.field_start_time.to_sym].to_s}'"}, 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pampa
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.24
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-06 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel