postburner 0.6.1 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca9bed4afd8b585d14934b4ba09b20c58109d8de39d5300d135069e2723c3aba
-  data.tar.gz: 5ae5f4a07e53ac69b4d4b795f3b8c8bdf5b9a087e1a8513f6fed03cb47e48210
+  metadata.gz: 0cd364ebe0fbc9c2a58ccf7adaf27fd5d2dc8ea20b237b0588bf0166d9246097
+  data.tar.gz: 6fb7546229e800d08f7ce8cfbc064738c5b674154cf974abd03a8a2fe9256402
 SHA512:
-  metadata.gz: c741884d62b1b71b7c8ce928baff5fef35054c58962f530ee06764b4947477ca394712300256e98409187494092c7164a5f8490482e54a19d0f1776b8465f783
-  data.tar.gz: 193a2e625139d0a441503afc15d64888eb25234d0ae81ca320a319506130e8eb1c960141d60b97066633f6a777ab47fe21d49d42bc448497b4225e8c78924051
+  metadata.gz: 54ce781b47f35920855a4f2491038b81bbe6c658f45fe7b001d2dc3fb2d31a13a87bc67e79a53a3832dfd2b1fb7a0c6cc8e91f686c6264e5c3a52c2513e6cbc9
+  data.tar.gz: d5f865f2a214709e4bcd4da8c04a45840202344ad3e2d9d94dd937f604fd21ca624c18fa284d3ce58e804ce405bb5c2c9bd53921c3706015f492202fe4c1e474

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## v0.6.4 - 2022-05-21
+
+### Fixed
+- add rails 7 to gemspec.
+
+## v0.6.3 - 2021-11-02
+
+### Fixed
+- fix #remove! to allow removal even if no beanstalkd job present.
+
+## v0.6.2 - 2021-11-01
+
+### Fixed
+- add #requeue method.
+- check if AlreadyProcessed.
+
 ## v0.6.1 - 2021-11-01
 
 ### Updated

data/app/models/postburner/job.rb

@@ -31,15 +31,19 @@ module Postburner
     def queue!(options={})
       return if self.queued_at.present? && self.bkid.present?
       raise ActiveRecord::RecordInvalid, "Can't queue unless valid." unless self.valid?
+      raise AlreadyProcessed, "Processed at #{self.processed_at}" if self.processed_at
+
       at = options.delete(:at)
+      now = Time.zone.now
 
+      self.queued_at = now
       self.run_at = case
                     when at.present?
                       # this is rudimentary, add error handling
-                      options[:delay] ||= at.to_i - Time.zone.now.to_i
+                      options[:delay] ||= at.to_i - now.to_i
                       at
                     when options[:delay].present?
-                      Time.zone.now + options[:delay].seconds
+                      now + options[:delay].seconds
                     end
 
       @_insert_options = options
@@ -47,6 +51,13 @@ module Postburner
       self.save!
     end
 
+    def requeue!(options={})
+      self.delete!
+      self.bkid, self.queued_at = nil, nil
+
+      self.queue! options
+    end
+
     def will_insert?
       @_insert_options.is_a? Hash
     end
@@ -104,7 +115,7 @@ module Postburner
           return
         end
 
-        self.log!('START')
+        self.log!("START (bkid #{self.bkid})")
 
         begin
           self.perform(args)
@@ -114,7 +125,7 @@ module Postburner
           raise exception
         end
 
-        self.log!('DONE')
+        self.log!("DONE (bkid #{self.bkid})")
 
         begin
           now = Time.zone.now
@@ -155,12 +166,9 @@ module Postburner
     end
 
     def remove!
-      if self.beanstalk_job
-        self.delete!
-        self.update_column(:removed_at, Time.zone.now)
-      else
-        false
-      end
+      return if self.removed_at
+      self.delete!
+      self.update_column(:removed_at, Time.zone.now)
     end
 
     def beanstalk_job
@@ -181,6 +189,7 @@ module Postburner
       self.errata << [
         Time.zone.now,
         {
+          bkid:       self.bkid,
           class:      exception.class,
           message:    exception.message,
           backtrace:  exception.backtrace,
@@ -200,9 +209,10 @@ module Postburner
       self.logs << [
         Time.zone.now, # time
         {
-          level: options[:level], # level
-          message: message, # message
-          elapsed: self.elapsed_ms, # ms from start
+          bkid:     self.bkid,
+          level:    options[:level], # level
+          message:  message, # message
+          elapsed:  self.elapsed_ms, # ms from start
         }
       ]
     end
@@ -219,6 +229,12 @@ module Postburner
       self.update_column :logs, self.logs
     end
 
+    def intended_at
+      self.run_at ? self.run_at : self.queued_at
+    end
+
+    class AlreadyProcessed < StandardError; end
+
     private
 
     def persist_metadata!(data={})
@@ -236,19 +252,22 @@ module Postburner
     end
 
     def insert!(options={})
-      response = Backburner::Worker.enqueue(
-        Postburner::Job,
-        self.id,
-        options
-      )
+      response = nil
+
+      Job.transaction do
+        response = Backburner::Worker.enqueue(
+          Postburner::Job,
+          self.id,
+          options
+        )
+
+        persist_metadata!(
+          bkid: response[:id],
+        )
+      end
 
       self.log("QUEUED: #{response}")
 
-      persist_metadata!(
-        queued_at:  Time.zone.now,
-        bkid:       response[:id],
-      )
-
       response
     end
 
@@ -256,14 +275,10 @@ module Postburner
       now = Time.zone.now
       self.attempts << now
       self.attempting_at ||= now
-      self.lag ||= (self.attempting_at - self.intended_at) * 1000
+      self.lag ||= (self.attempting_at - self.intended_at) * 1000 rescue nil
       now
     end
 
-    def intended_at
-      self.run_at ? self.run_at : self.queued_at
-    end
-
     def ensure_sid!
       self.sid ||= SecureRandom.uuid
     end

data/lib/postburner/version.rb

@@ -1,3 +1,3 @@
 module Postburner
-  VERSION = '0.6.1'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postburner
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.4
 platform: ruby
 authors:
 - Matt Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,6 +20,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.3.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,6 +33,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.3.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.0.3
 - !ruby/object:Gem::Dependency
   name: backburner
   requirement: !ruby/object:Gem::Requirement