Skip to content

Commit

Permalink
[ServiceBus] Sample Fix (#13719)
Browse files Browse the repository at this point in the history
* fix samples

* revert duration
  • Loading branch information
yunhaoling authored Sep 10, 2020
1 parent 655a864 commit a09a66c
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion sdk/servicebus/azure-servicebus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio
[cloud_shell]: https://docs.microsoft.com/azure/cloud-shell/overview
[cloud_shell_bash]: https://shell.azure.com/bash
[pip]: https://pypi.org/project/pip/
[pypi]: https://pypi.org/project/azure-servicebus/7.0.0b4/
[pypi]: https://pypi.org/project/azure-servicebus/7.0.0b6/
[python]: https://www.python.org/downloads/
[venv]: https://docs.python.org/3/library/venv.html
[virtualenv]: https://virtualenv.pypa.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ async def renew_lock_on_message_received_from_non_sessionful_entity():
renewer = AutoLockRenew()

async with servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME, prefetch_count=10) as receiver:
received_msgs = await receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = await receiver.receive_messages(max_message_count=10, max_wait_time=5)

for msg in received_msgs:
# automatically renew the lock on each message for 100 seconds
Expand Down Expand Up @@ -75,7 +75,7 @@ async def renew_lock_on_session_of_the_sessionful_entity():
renewer.register(receiver.session, timeout=100)
print('Register session into AutoLockRenew.')

received_msgs = await receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = await receiver.receive_messages(max_message_count=10, max_wait_time=5)
await asyncio.sleep(100) # message handling for long period (E.g. application logic)

for msg in received_msgs:
Expand Down Expand Up @@ -104,7 +104,7 @@ async def on_lock_renew_failure_callback(renewable, error):
# handle any processing on the message or session that was in progress.
print("Intentionally failed to renew lock on {} due to {}".format(renewable, error))

received_msgs = await receiver.receive_messages(max_batch_size=1, max_wait_time=5)
received_msgs = await receiver.receive_messages(max_message_count=1, max_wait_time=5)

for msg in received_msgs:
# automatically renew the lock on each message for 120 seconds
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ async def get_and_update_queue(servicebus_mgmt_client):
await servicebus_mgmt_client.update_queue(queue_properties)


async def get_queue_runtime_info(servicebus_mgmt_client):
print("-- Get Queue Runtime Info")
queue_runtime_info = await servicebus_mgmt_client.get_queue_runtime_info(QUEUE_NAME)
print("Queue Name:", queue_runtime_info.name)
print("Queue Runtime Info:")
print("Updated at:", queue_runtime_info.updated_at)
print("Size in Bytes:", queue_runtime_info.size_in_bytes)
print("Message Count:", queue_runtime_info.total_message_count)
print("Please refer to QueueRuntimeInfo from complete available runtime information.")
async def get_queue_runtime_properties(servicebus_mgmt_client):
print("-- Get Queue Runtime Properties")
queue_runtime_properties = await servicebus_mgmt_client.get_queue_runtime_properties(QUEUE_NAME)
print("Queue Name:", queue_runtime_properties.name)
print("Queue Runtime Properties:")
print("Updated at:", queue_runtime_properties.updated_at_utc)
print("Size in Bytes:", queue_runtime_properties.size_in_bytes)
print("Message Count:", queue_runtime_properties.total_message_count)
print("Please refer to QueueRuntimeProperties from complete available runtime properties.")
print("")


Expand All @@ -76,7 +76,7 @@ async def main():
await create_queue(servicebus_mgmt_client)
await list_queues(servicebus_mgmt_client)
await get_and_update_queue(servicebus_mgmt_client)
await get_queue_runtime_info(servicebus_mgmt_client)
await get_queue_runtime_properties(servicebus_mgmt_client)
await delete_queue(servicebus_mgmt_client)

loop = asyncio.get_event_loop()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ async def main():
print('dead lettering messages')
receiver = servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME)
async with receiver:
received_msgs = await receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = await receiver.receive_messages(max_message_count=10, max_wait_time=5)
for msg in received_msgs:
print(str(msg))
await msg.dead_letter()
Expand All @@ -43,7 +43,7 @@ async def main():
sub_queue=SubQueue.DeadLetter,
prefetch_count=10)
async with dlq_receiver:
received_msgs = await dlq_receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = await dlq_receiver.receive_messages(max_message_count=10, max_wait_time=5)
for msg in received_msgs:
print(str(msg))
await msg.complete()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ async def main():

receiver = servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME)
async with receiver:
received_msgs = await receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = await receiver.receive_messages(max_message_count=10, max_wait_time=5)
deferred_sequenced_numbers = []
for msg in received_msgs:
print("Deferring msg: {}".format(str(msg)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ async def main():
async with servicebus_client:
receiver = servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME)
async with receiver:
received_msgs = await receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = await receiver.receive_messages(max_message_count=10, max_wait_time=5)
for msg in received_msgs:
print(str(msg))
await msg.complete()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async def main():
subscription_name=SUBSCRIPTION_NAME
)
async with receiver:
received_msgs = await receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = await receiver.receive_messages(max_message_count=10, max_wait_time=5)
for msg in received_msgs:
print(str(msg))
await msg.complete()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async def receive_batch_messages(receiver):
session = receiver.session
await session.set_state("START")
print("Session state:", await session.get_state())
received_msgs = await receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = await receiver.receive_messages(max_message_count=10, max_wait_time=5)
for msg in received_msgs:
print(str(msg))
await msg.complete()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def renew_lock_on_message_received_from_non_sessionful_entity():
renewer = AutoLockRenew()

with servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME, prefetch_count=10) as receiver:
received_msgs = receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = receiver.receive_messages(max_message_count=10, max_wait_time=5)

for msg in received_msgs:
# automatically renew the lock on each message for 100 seconds
Expand Down Expand Up @@ -75,7 +75,7 @@ def renew_lock_on_session_of_the_sessionful_entity():
renewer.register(receiver.session, timeout=100)
print('Register session into AutoLockRenew.')

received_msgs = receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = receiver.receive_messages(max_message_count=10, max_wait_time=5)
time.sleep(100) # message handling for long period (E.g. application logic)

for msg in received_msgs:
Expand Down Expand Up @@ -107,7 +107,7 @@ def on_lock_renew_failure_callback(renewable, error):
# handle any processing on the message or session that was in progress.
print("Intentionally failed to renew lock on {} due to {}".format(renewable, error))

received_msgs = receiver.receive_messages(max_batch_size=1, max_wait_time=5)
received_msgs = receiver.receive_messages(max_message_count=1, max_wait_time=5)

for msg in received_msgs:
# automatically renew the lock on each message for 120 seconds
Expand Down
20 changes: 10 additions & 10 deletions sdk/servicebus/azure-servicebus/samples/sync_samples/mgmt_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,21 @@ def get_and_update_queue(servicebus_mgmt_client):
servicebus_mgmt_client.update_queue(queue_properties)


def get_queue_runtime_info(servicebus_mgmt_client):
print("-- Get Queue Runtime Info")
queue_runtime_info = servicebus_mgmt_client.get_queue_runtime_info(QUEUE_NAME)
print("Queue Name:", queue_runtime_info.name)
print("Queue Runtime Info:")
print("Updated at:", queue_runtime_info.updated_at)
print("Size in Bytes:", queue_runtime_info.size_in_bytes)
print("Message Count:", queue_runtime_info.total_message_count)
print("Please refer to QueueRuntimeInfo from complete available runtime information.")
def get_queue_runtime_properties(servicebus_mgmt_client):
print("-- Get Queue Runtime Properties")
get_queue_runtime_properties = servicebus_mgmt_client.get_queue_runtime_properties(QUEUE_NAME)
print("Queue Name:", get_queue_runtime_properties.name)
print("Queue Runtime Properties:")
print("Updated at:", get_queue_runtime_properties.updated_at_utc)
print("Size in Bytes:", get_queue_runtime_properties.size_in_bytes)
print("Message Count:", get_queue_runtime_properties.total_message_count)
print("Please refer to QueueRuntimeProperties from complete available runtime properties.")
print("")


with ServiceBusAdministrationClient.from_connection_string(CONNECTION_STR) as servicebus_mgmt_client:
create_queue(servicebus_mgmt_client)
list_queues(servicebus_mgmt_client)
get_and_update_queue(servicebus_mgmt_client)
get_queue_runtime_info(servicebus_mgmt_client)
get_queue_runtime_properties(servicebus_mgmt_client)
delete_queue(servicebus_mgmt_client)
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
print('dead lettering messages')
receiver = servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME)
with receiver:
received_msgs = receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = receiver.receive_messages(max_message_count=10, max_wait_time=5)
for msg in received_msgs:
print(str(msg))
msg.dead_letter()

print('receiving deadlettered messages')
dlq_receiver = servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME, sub_queue=SubQueue.DeadLetter)
with dlq_receiver:
received_msgs = dlq_receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = dlq_receiver.receive_messages(max_message_count=10, max_wait_time=5)
for msg in received_msgs:
print(str(msg))
msg.complete()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

receiver = servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME)
with receiver:
received_msgs = receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = receiver.receive_messages(max_message_count=10, max_wait_time=5)
deferred_sequenced_numbers = []
for msg in received_msgs:
print("Deferring msg: {}".format(str(msg)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
with servicebus_client:
receiver = servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME)
with receiver:
received_msgs = receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = receiver.receive_messages(max_message_count=10, max_wait_time=5)
for msg in received_msgs:
print(str(msg))
msg.complete()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
subscription_name=SUBSCRIPTION_NAME
)
with receiver:
received_msgs = receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = receiver.receive_messages(max_message_count=10, max_wait_time=5)
for msg in received_msgs:
print(str(msg))
msg.complete()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def receive_batch_message(receiver):
session = receiver.session
session.set_state("START")
print("Session state:", session.get_state())
received_msgs = receiver.receive_messages(max_batch_size=10, max_wait_time=5)
received_msgs = receiver.receive_messages(max_message_count=10, max_wait_time=5)
for msg in received_msgs:
print(str(msg))
msg.complete()
Expand Down

0 comments on commit a09a66c

Please sign in to comment.