google-cloud-pubsub 0.39.1 → 0.39.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf882043d5708f044079a8f088e7dd086f0937699c3bb3dd84576a91104068d8
-  data.tar.gz: e3dcd45ebe5db15aed15e0da2a107c92886eccdb750dd48bb5ea917180fb8e62
+  metadata.gz: 4f34b6b5827c709ce82dec3ae2c24557ec83f77bd8e381d32d82f100532894e3
+  data.tar.gz: 4a07069df138d0bf056421edcf1f0f611ad5911e7317f16e2561dcc0421daba1
 SHA512:
-  metadata.gz: ffa8488744cc16ff26a842123b6ddbf4abc785936ae94212da3ae73c78aa4c7cc98965529ce074036befb878e05d109aca7c8024c810919d663232542d721228
-  data.tar.gz: daa27cdc0f831d25e0d4ece569d4ff6c8bc3150b92b7221b3ab531f3d267ed398c7fc130db815cd7df8036a6f2efbd3a544c2d36c059b739cce23db45db700da
+  metadata.gz: a52c5e7fd8d4425f1beab86ac4235b817148f4e89992a7cdcfee7e3c87a4706334f12489aa7d7b305575d42cd446a4b714cd97f7132e3b61ac782f41bfcc6f87
+  data.tar.gz: ff2bfa65c4f97d6ec09602d4fdf889f279531b45ec55bc4e4d70481530e978a85f22832fc42d08bf14b11caf9ad3970411570da97b970c0ceda4a30d44153b7a

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History
 
+### 0.39.2 / 2019-09-17
+
+#### Bug Fixes
+
+* Do not interrupt Subscriber callbacks when stopping
+  * Allow in-process callbacks to complete when a Subscriber is stopped.
+
+#### Documentation
+
+* Update Subscriber stop and wait documentation
+  * Update Subscriber#stop and Subscriber#wait! method
+
 ### 0.39.1 / 2019-09-04
 
 #### Features

data/lib/google/cloud/pubsub/subscriber.rb

@@ -123,10 +123,12 @@ module Google
         end
 
         ##
-        # Begins the process of stopping the subscriber. Unhandled received
-        # messages will be processed, but no new messages will be pulled from
-        # the subscription. Use {#wait!} to block until the subscriber is fully
-        # stopped and all received messages have been processed.
+        # Immediately stops the subscriber. No new messages will be pulled from
+        # the subscription. All actions taken on received messages that have not
+        # yet been sent to the API will be sent to the API. All received but
+        # unprocessed messages will be released back to the API and redelivered.
+        # Use {#wait!} to block until the subscriber is fully stopped and all
+        # received messages have been processed or released.
         #
         # @return [Subscriber] returns self so calls can be chained.
         def stop
@@ -147,9 +149,11 @@ module Google
 
         ##
         # Blocks until the subscriber is fully stopped and all received messages
-        # have been handled. Does not stop the subscriber. To stop the
-        # subscriber, first call {#stop} and then call {#wait!} to block until
-        # the subscriber is stopped.
+        # have been processed or released.
+        #
+        # Does not stop the subscriber. To stop the subscriber, first call
+        # {#stop} and then call {#wait!} to block until the subscriber is
+        # stopped.
         #
         # @return [Subscriber] returns self so calls can be chained.
         def wait!

data/lib/google/cloud/pubsub/subscriber/stream.rb

@@ -88,8 +88,9 @@ module Google
               @pause_cond.broadcast
 
               # Now that the reception thread is stopped, immediately stop the
-              # callback thread pool and purge all pending callbacks.
-              @callback_thread_pool.kill
+              # callback thread pool. All queued callbacks will see the stream
+              # is stopped and perform a noop.
+              @callback_thread_pool.shutdown
 
               # Once all the callbacks are stopped, we can stop the inventory.
               @inventory.stop
@@ -107,6 +108,9 @@ module Google
           end
 
           def wait!
+            # Wait for all queued callbacks to be processed.
+            @callback_thread_pool.wait_for_termination 60
+
             self
           end
 
@@ -268,14 +272,14 @@ module Google
             return unless callback_thread_pool.running?
 
             Concurrent::Promises.future_on(
-              callback_thread_pool, @subscriber, @inventory, rec_msg
-            ) do |sub, inv, msg|
+              callback_thread_pool, self, rec_msg
+            ) do |stream, msg|
               begin
-                sub.callback.call msg
+                stream.subscriber.callback.call msg unless stream.stopped?
               rescue StandardError => callback_error
-                sub.error! callback_error
+                stream.subscriber.error! callback_error
               ensure
-                inv.remove msg.ack_id
+                stream.inventory.remove msg.ack_id
               end
             end
           end

data/lib/google/cloud/pubsub/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module PubSub
-      VERSION = "0.39.1".freeze
+      VERSION = "0.39.2".freeze
     end
 
     Pubsub = PubSub unless const_defined? :Pubsub

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-pubsub
 version: !ruby/object:Gem::Version
-  version: 0.39.1
+  version: 0.39.2
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core