From c9c4bd8b449141d42c536b4c31afe31f43fd5150 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Tue, 20 Apr 2021 14:54:53 +0100 Subject: [PATCH 1/2] Clarify log line when sending a link test It wasn't clear what the ID in the message was. It's not possible to add more details to the message - we don't create a broadcast message or event for a link test. --- app/celery/broadcast_message_tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/celery/broadcast_message_tasks.py b/app/celery/broadcast_message_tasks.py index 422feaa59..7ef93db5b 100644 --- a/app/celery/broadcast_message_tasks.py +++ b/app/celery/broadcast_message_tasks.py @@ -236,6 +236,6 @@ def trigger_link_test(provider): sequence = Sequence('broadcast_provider_message_number_seq') sequential_number = db.session.connection().execute(sequence) formatted_seq_number = format_sequential_number(sequential_number) - message = f"Sending a link test to CBC proxy for provider {provider} with ID {identifier}" + message = f"Sending a link test to CBC proxy for provider {provider}. Identifier in payload is {identifier}" current_app.logger.info(message) cbc_proxy_client.get_proxy(provider).send_link_test(identifier, formatted_seq_number) From e6357c91c9b06812e27a011a6ff94b4858450301 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Tue, 20 Apr 2021 15:34:49 +0100 Subject: [PATCH 2/2] Add more details to messages in send_broadcast_provider_message task This ensures that the log messages both contain broadcast_event id and broadcast_provider_message id. It also removes the broadcast_event reference since this isn't particularly useful in helping to find an event. --- app/celery/broadcast_message_tasks.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/celery/broadcast_message_tasks.py b/app/celery/broadcast_message_tasks.py index 7ef93db5b..9c05cf35c 100644 --- a/app/celery/broadcast_message_tasks.py +++ b/app/celery/broadcast_message_tasks.py @@ -163,8 +163,8 @@ def send_broadcast_provider_message(self, broadcast_event_id, provider): formatted_message_number = format_sequential_number(broadcast_provider_message.message_number) current_app.logger.info( - f'invoking cbc proxy to send ' - f'broadcast_event {broadcast_event.reference} ' + f'Invoking cbc proxy to send broadcast_provider_message with ID of {broadcast_provider_message.id} ' + f'and broadcast_event ID of {broadcast_event_id} ' f'msgType {broadcast_event.message_type}' ) @@ -215,8 +215,8 @@ def send_broadcast_provider_message(self, broadcast_event_id, provider): except CBCProxyRetryableException as exc: delay = get_retry_delay(self.request.retries) current_app.logger.exception( - f'Retrying send_broadcast_provider_message for broadcast_event {broadcast_event_id} and ' + - f'provider {provider} in {delay} seconds' + f'Retrying send_broadcast_provider_message for broadcast event {broadcast_event_id}, ' + f'provider message {broadcast_provider_message.id}, provider {provider} in {delay} seconds' ) self.retry(