activejob-google_cloud_pubsub 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd2666c082bf65b5b43a727217f8eafaf97ad54
-  data.tar.gz: 63c2c8bf57004c1316d6b74afe0c067a6a7c7f9e
+  metadata.gz: 7e1151a90370ecf792eae87e6daf9fd28e985de3
+  data.tar.gz: 50b07a891b460d56c44fa1e60ed08b31ddfdd354
 SHA512:
-  metadata.gz: c05fd361f9da5456c4a5dfc0efd75cd40b18d4bd2af9c15980c4d7aaec96dd6cc695680b01b29d350fefaf174d8264226080c3adfe7314ed0c282c4e27b7ccd4
-  data.tar.gz: 04643c9cdbc51a4ea8d371f062d4d5f2d5dc5728f0e238ac650267d2e2411ea73bc030115ca92dc93c1772830ae070eaa5ca774a5f8fde5cc202e964164608da
+  metadata.gz: 32504d3cd91e414cd6df30b90c7c5b16035a1bda30f2dfe48540adb22ba377fdfea0d867347c793fd2ed717f7e1e224cd9afd68cd3a9649ab7ca63b2bdf30e01
+  data.tar.gz: 4f249b0da43e0212f5ec16ed3df3c31eefdad9fa91045b0c84938fb6ab1fba0c3ba6ae16a4c9a8ef48b39e1f90fbab9af60f7f20270a6bc777bacd3317ccb572

data/README.md

@@ -69,7 +69,7 @@ Rails.application.config.active_job.queue_adapter = ActiveJob::GoogleCloudPubsub
 )
 ```
 
-Please see [`Google::Cloud::Pubsub.new`](http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-pubsub/latest/google/cloud/pubsub?method=new-class) for details.
+Please see [`Google::Cloud::Pubsub.new`](http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-pubsub/master/google/cloud/pubsub?method=new-class) for details.
 
 ### Worker
 

data/exe/activejob-google_cloud_pubsub-worker

@@ -39,4 +39,8 @@ require opts[:require] if opts[:require]
 
 pubsub = Google::Cloud::Pubsub.new(pubsub_args)
 
-ActiveJob::GoogleCloudPubsub::Worker.new(pubsub: pubsub, **worker_args).run
+begin
+  ActiveJob::GoogleCloudPubsub::Worker.new(pubsub: pubsub, **worker_args).run
+rescue Interrupt
+  exit
+end

data/lib/activejob-google_cloud_pubsub/version.rb

@@ -1,5 +1,5 @@
 module ActiveJob
   module GoogleCloudPubsub
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/lib/activejob-google_cloud_pubsub/worker.rb

@@ -23,6 +23,8 @@ module ActiveJob
         pool = Concurrent::ThreadPoolExecutor.new(min_threads: @min_threads, max_threads: @max_threads, max_queue: -1)
 
         @pubsub.subscription_for(@queue_name).listen do |message|
+          logger.info "Message(#{message.message_id}) was received."
+
           begin
             Concurrent::Promise.execute(args: message, executor: pool) {|msg|
               process msg
@@ -31,6 +33,8 @@ module ActiveJob
             }
           rescue Concurrent::RejectedExecutionError
             message.delay! 10.seconds.to_i
+
+            logger.info "Message(#{message.message_id}) was rescheduled after 10 seconds because the thread pool is full."
           end
         end
       end
@@ -45,12 +49,17 @@ module ActiveJob
 
       def process(message)
         if timestamp = message.attributes['timestamp']
-          ts = Time.at(timestamp.to_f)
+          ts  = Time.at(timestamp.to_f)
+          now = Time.now
 
-          if ts >= Time.now
+          if ts <= now
             _process message
           else
-            message.delay! [(ts - Time.now).ceil, MAX_DEADLINE.to_i].min
+            deadline = [(ts - now).to_f.ceil, MAX_DEADLINE.to_i].min
+
+            message.delay! deadline
+
+            logger.info "Message(#{message.message_id}) was rescheduled after #{deadline} seconds because the timestamp is #{ts}."
           end
         else
           _process message
@@ -84,6 +93,8 @@ module ActiveJob
 
           if succeeded || failed
             message.acknowledge!
+
+            logger.info "Message(#{message.message_id}) was acknowledged."
           else
             # terminated from outside
             message.delay! 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activejob-google_cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Keita Urashima