Skip to content

Commit

Permalink
Merge branch 'master' into opentelemetry-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
sethmaxwl authored Jul 16, 2020
2 parents a19082f + b1bfc9e commit e237daf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions samples/snippets/subscriber.py
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ def callback(message):


def receive_messages_with_delivery_attempts(project_id, subscription_id, timeout=None):
# [START pubsub_dead_letter_delivery_attempt]
# [START pubsub_dead_letter_delivery_attempt]
from concurrent.futures import TimeoutError
from google.cloud import pubsub_v1

Expand All @@ -616,7 +616,7 @@ def callback(message):
streaming_pull_future.result(timeout=timeout)
except TimeoutError:
streaming_pull_future.cancel()
# [END pubsub_dead_letter_delivery_attempt]
# [END pubsub_dead_letter_delivery_attempt]


if __name__ == "__main__":
Expand Down

0 comments on commit e237daf

Please sign in to comment.