activejob-google_cloud_pubsub 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e1151a90370ecf792eae87e6daf9fd28e985de3
-  data.tar.gz: 50b07a891b460d56c44fa1e60ed08b31ddfdd354
+  metadata.gz: 2e759c958bd41ca18bb5d4cc514c5586ceba3ea8
+  data.tar.gz: 213be00c966bd8c92c2a22a7c96dec0ad9a3ff9c
 SHA512:
-  metadata.gz: 32504d3cd91e414cd6df30b90c7c5b16035a1bda30f2dfe48540adb22ba377fdfea0d867347c793fd2ed717f7e1e224cd9afd68cd3a9649ab7ca63b2bdf30e01
-  data.tar.gz: 4f249b0da43e0212f5ec16ed3df3c31eefdad9fa91045b0c84938fb6ab1fba0c3ba6ae16a4c9a8ef48b39e1f90fbab9af60f7f20270a6bc777bacd3317ccb572
+  metadata.gz: 21a981c551c6a78180b3de7eff2fafaaac555b134ab50d9da63fe8219c84509635ed0dd09986480922fe46a82716cbccf657b543484f7d83cffe4683b6e98a25
+  data.tar.gz: be921aa73fdcfdca65a985897c9a8f9aa92b860f8254b0d9418deb6530e3e6f824e8a5fd446e28659dbaf6b5412f25bb79aa8acec63e90260f880b921aaedac7

data/README.md

@@ -62,6 +62,9 @@ When passing options to the adapter, you need to create the object instead of a
 
 ``` ruby
 Rails.application.config.active_job.queue_adapter = ActiveJob::GoogleCloudPubsub::Adapter.new(
+  async:  false,
+  logger: Rails.logger,
+
   pubsub: Google::Cloud::Pubsub.new(
     project: 'MY-PROJECT-ID',
     keyfile: 'path/to/keyfile.json'
@@ -69,7 +72,23 @@ 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/master/google/cloud/pubsub?method=new-class) for details.
+#### `async`
+
+Whether to publish messages asynchronously.
+
+Default: `true`
+
+#### `logger`
+
+The logger that outputs a message publishing error. Specify `nil` to disable logging.
+
+Default: `Logger.new($stdout)`
+
+#### `pubsub`
+
+The instance of `Google::Cloud::Pubsub::Project`. 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.
+
+Default: `Google::Cloud::Pubsub.new`
 
 ### Worker
 

data/lib/activejob-google_cloud_pubsub/adapter.rb

@@ -1,18 +1,26 @@
 require 'activejob-google_cloud_pubsub/pubsub_extension'
+require 'concurrent'
 require 'google/cloud/pubsub'
 require 'json'
+require 'logger'
 
 module ActiveJob
   module GoogleCloudPubsub
     class Adapter
       using PubsubExtension
 
-      def initialize(pubsub: Google::Cloud::Pubsub.new)
-        @pubsub = pubsub
+      def initialize(async: true, pubsub: Google::Cloud::Pubsub.new, logger: Logger.new($stdout))
+        @executor = async ? :io : :immediate
+        @pubsub   = pubsub
+        @logger   = logger
       end
 
       def enqueue(job, attributes = {})
-        @pubsub.topic_for(job.queue_name).publish JSON.dump(job.serialize), attributes
+        Concurrent::Promise.execute(executor: @executor) {
+          @pubsub.topic_for(job.queue_name).publish JSON.dump(job.serialize), attributes
+        }.rescue {|e|
+          @logger&.error e
+        }
       end
 
       def enqueue_at(job, timestamp)

data/lib/activejob-google_cloud_pubsub/version.rb

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

data/lib/activejob-google_cloud_pubsub/worker.rb

@@ -13,28 +13,34 @@ module ActiveJob
 
       using PubsubExtension
 
-      cattr_accessor(:logger) { Logger.new($stdout) }
-
-      def initialize(queue: 'default', min_threads: 0, max_threads: Concurrent.processor_count, pubsub: Google::Cloud::Pubsub.new)
-        @queue_name, @min_threads, @max_threads, @pubsub = queue, min_threads, max_threads, pubsub
+      def initialize(queue: 'default', min_threads: 0, max_threads: Concurrent.processor_count, pubsub: Google::Cloud::Pubsub.new, logger: Logger.new($stdout))
+        @queue_name  = queue
+        @min_threads = min_threads
+        @max_threads = max_threads
+        @pubsub      = pubsub
+        @logger      = logger
       end
 
       def run
         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."
+          @logger&.info "Message(#{message.message_id}) was received."
 
           begin
             Concurrent::Promise.execute(args: message, executor: pool) {|msg|
               process msg
             }.rescue {|e|
-              logger.error e
+              @logger&.error e
             }
           rescue Concurrent::RejectedExecutionError
-            message.delay! 10.seconds.to_i
+            Concurrent::Promise.execute(args: message) {|msg|
+              msg.delay! 10.seconds.to_i
 
-            logger.info "Message(#{message.message_id}) was rescheduled after 10 seconds because the thread pool is full."
+              @logger&.info "Message(#{msg.message_id}) was rescheduled after 10 seconds because the thread pool is full."
+            }.rescue {|e|
+              @logger&.error e
+            }
           end
         end
       end
@@ -59,7 +65,7 @@ module ActiveJob
 
             message.delay! deadline
 
-            logger.info "Message(#{message.message_id}) was rescheduled after #{deadline} seconds because the timestamp is #{ts}."
+            @logger&.info "Message(#{message.message_id}) was rescheduled after #{deadline} seconds because the timestamp is #{ts}."
           end
         else
           _process message
@@ -94,7 +100,7 @@ module ActiveJob
           if succeeded || failed
             message.acknowledge!
 
-            logger.info "Message(#{message.message_id}) was acknowledged."
+            @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.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Keita Urashima