expire_job 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d7a4c066e98544b2ca25d52860a5be8cc80c3eeb3f6b75e92403fbce081107
-  data.tar.gz: 1c38abfd9f690bb47a4cb5ce3432e6aef78e01e0c97a4d45c500587ebb4d7a9a
+  metadata.gz: e49e166641d175779874a57c61e701aefe19937a287db2d00333fc2bd132d527
+  data.tar.gz: 738b967e2b40aa86b06a9480bdbea0eaf11e65441995936a539eeb8d672bf116
 SHA512:
-  metadata.gz: 6595f406df56ac89d17fcd768708255b789614e9c3947131fb324d65584786f90a9919e782597a1e7171721596ef02b1795f747c4c70e8734c2ff49b991e10f9
-  data.tar.gz: 84508ba69f85c5eebec2db8940303c49d3dd7133ce7956fbc56a93e22c8bcc43945cf36136186031d3aca4014533afface31ccb3ff75bbe94138b781ace29595
+  metadata.gz: 705c410d3db4c47d079770d24692329feabebbadd55cbc3bb667b882df4f0f521e66fd7f0458f464394a7b93d64d8fbc5c91d24b004c68714b9f30172eae22dd
+  data.tar.gz: 82d2af05a9ef65c665d66460b75e2b5f41f62d5258afe43aeb7a55f0162f865a1940de7e02bde3a889bd18e72fdd3e6e4544f8bf6d682dfd6d35037fd544ef57

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    expire_job (0.1.1)
+    expire_job (0.1.2)
       sidekiq (> 6.0, < 7.0)
 
 GEM

data/lib/expire_job/version.rb

@@ -1,3 +1,3 @@
 module ExpireJob
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/expire_job.rb

@@ -9,25 +9,25 @@ module ExpireJob
       if worker.respond_to?(:expire_in)
         picked_time = pick_enqueued_at(msg)
         parsed_time = parse_time(picked_time)
-        if perform_expire_check(worker, msg['args'], worker.expire_in, parsed_time)
+
+        if perform_expire_check(worker.expire_in, parsed_time)
           yield
+        else
+          logger.info { "Expired job is skipped. args=#{truncate(msg['args'].inspect)}" }
+          perform_callback(worker, :after_expire, msg['args'])
         end
       else
         yield
       end
     end
 
-    def perform_expire_check(worker, args, expire_in, enqueued_at)
+    def perform_expire_check(expire_in, enqueued_at)
       if enqueued_at.nil?
-        logger.warn { "Can not expire this job because enqueued_at is not found. args=#{truncate(args.inspect)}" }
+        logger.warn { "Can not expire this job because enqueued_at is nil." }
         return true
       end
 
       if enqueued_at < Time.now - expire_in
-        logger.info { "Skip expired job. args=#{truncate(args.inspect)}" }
-
-        perform_callback(worker, :after_expire, args)
-
         false
       else
         true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expire_job
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ts-3156