hanami-events-cloud_pubsub 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce3a1788cccaf44d604f113f700ffe69b2e198d068b6dce7ed25f85bc1c2f72a
-  data.tar.gz: 0cbbe24fb26de4fc989dcfc53f2cb73fccaacc58408deaae623d1d6d7e249ba2
+  metadata.gz: cedb970c9a8160f1d3b1e1c41dd87b5bfb8d35cb29872694af944110f681b7fc
+  data.tar.gz: 277273b17749ba058a545f1caadc3819688964c9fccaaf34a1774b7445f4b86f
 SHA512:
-  metadata.gz: 9789652777e1a651533eab9c0f68a418815ce7694b2888e4d6e01ffb0d2b8f5099cea2dbd9903fc6abb8c82b547f7107fcc3ce8356396414baa443335b2bc021
-  data.tar.gz: 585fc1954bc4431f5770f1eb7fb8d659c22f28726e69ecc60bdd4751e9a627de1e2f5321e142a04222a46c03d18d08aa5a6304102d8dd976b48ba0fb09aef770
+  metadata.gz: 2f76c43c7a07b590e9c9f6b7e8839d5ab37266c4b353099bfc1a872308db646c5a4421a3185c13e20d55a80e7a67242fac975824b29de4f0afee51a6af1e2d6f
+  data.tar.gz: af41acad939eabcf399b7f7936b54a99f173a00da497991929de64ebb00dbd3b0da8f48f917dfc1f8b818227671744631b6d6e260c4706c4a901086d479d1f1f

data/lib/hanami/events/cloud_pubsub/cli.rb

@@ -93,7 +93,7 @@ module Hanami
             end
 
             def logger
-              CloudPubsub.logger
+              Hanami::Events::CloudPubsub.logger
             end
 
             def setup_signal_handlers

data/lib/hanami/events/cloud_pubsub/listener.rb

@@ -42,7 +42,7 @@ module Hanami
 
         def register
           subscription = subscription_for(subscriber_id)
-          apply_retry_options(subscription)
+          apply_subscription_options(subscription)
           listener = subscription.listen(**subscriber_options) { |m| handle_message(m) }
           logger.debug("Registered listener for #{subscriber_id} with: #{subscriber_options}")
 
@@ -135,21 +135,38 @@ module Hanami
           }
         end
 
-        def apply_retry_options(sub)
-          retry_policy = build_retry_policy
+        def apply_subscription_options(sub)
+          apply_deadline_options(sub)
+          apply_retry_options(sub)
+          apply_dead_letter_options(sub)
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
+
+        def apply_deadline_options(sub)
+          sub.deadline = subscriber_options[:deadline] if sub.deadline != subscriber_options[:deadline]
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
+
+        def apply_dead_letter_options(sub)
           attempts = CloudPubsub.config.auto_retry.max_attempts
 
-          sub.retry_policy = retry_policy if sub.retry_policy&.to_grpc != retry_policy&.to_grpc
           sub.dead_letter_topic = dead_letter_topic if sub.dead_letter_topic&.name != dead_letter_topic&.name
           sub.dead_letter_max_delivery_attempts = attempts if sub.dead_letter_topic&.name != dead_letter_topic&.name
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
 
-          sub
+        def apply_retry_options(sub)
+          retry_policy = build_retry_policy
+          sub.retry_policy = retry_policy if sub.retry_policy&.to_grpc != retry_policy&.to_grpc
         rescue StandardError => e
           run_error_handlers(e, nil)
         end
 
         def build_retry_policy
-          return unless CloudPubsub.config.auto_retry.enabled
+          return unless Hanami::Events::CloudPubsub.config.auto_retry.enabled
 
           Google::Cloud::PubSub::RetryPolicy.new(
             minimum_backoff: CloudPubsub.config.auto_retry.minimum_backoff,

data/lib/hanami/events/cloud_pubsub/version.rb

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '3.2.0'
+      VERSION = '3.2.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable