fix: logging errors

CenterForOpenScience · May 5, 2023 · c8ed22b · c8ed22b
1 parent cc53225
commit c8ed22b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/share/search/daemon.py b/share/search/daemon.py
@@ -231,8 +231,8 @@ def _iterate_once(self):
                     raise TooFastSlowDown
                 else:
                     error_count += 1
-                    logger.error('%sEncountered error: %s', self.log_prefix, message_response.error_label)
-                    sentry_client.captureMessage('error handling message', data=message_response.error_label)
+                    logger.error('%sEncountered error: %s', self.log_prefix, message_response.error_text)
+                    sentry_client.captureMessage('error handling message', error_text=message_response.error_text)
                 target_id = message_response.index_message.target_id
                 for daemon_message in daemon_messages_by_target_id.pop(target_id):
                     daemon_message.ack()  # finally set it free

diff --git a/share/search/index_strategy/elastic8.py b/share/search/index_strategy/elastic8.py
@@ -108,7 +108,7 @@ def pls_handle_messages_chunk(self, messages_chunk):
                     is_done=is_done,
                     index_message=messages.IndexMessage(messages_chunk.message_type, message_target_id),
                     status_code=response_body.get('status'),
-                    error_label=(
+                    error_text=(
                         None
                         if ok
                         else str(response_body)

diff --git a/share/search/index_strategy/sharev2_elastic5.py b/share/search/index_strategy/sharev2_elastic5.py
@@ -108,12 +108,12 @@ def pls_handle_messages_chunk(self, messages_chunk):
             op_type, response_body = next(iter(response.items()))
             message_target_id = self._get_message_target_id(response_body['_id'])
             is_done = ok or (op_type == 'delete' and response_body.get('status') == 404)
-            error_label = None if is_done else str(response_body)
+            error_text = None if is_done else str(response_body)
             yield messages.IndexMessageResponse(
                 is_done=is_done,
                 index_message=messages.IndexMessage(messages_chunk.message_type, message_target_id),
                 status_code=response_body.get('status'),
-                error_label=error_label,
+                error_text=error_text,
             )
 
     # abstract method from IndexStrategy

diff --git a/share/search/messages.py b/share/search/messages.py
@@ -63,7 +63,7 @@ class IndexMessageResponse(typing.NamedTuple):
     is_done: bool
     index_message: IndexMessage
     status_code: int
-    error_label: typing.Optional[str] = None
+    error_text: typing.Optional[str] = None
 
 
 @dataclasses.dataclass

diff --git a/tests/share/search/test_daemon.py b/tests/share/search/test_daemon.py
@@ -171,7 +171,7 @@ def pls_handle_messages_chunk(self, messages_chunk):
                         is_done=False,
                         index_message=messages.IndexMessage(messages_chunk.message_type, target_id),
                         status_code=418,
-                        error_label='i am a teapot',
+                        error_text='i am a teapot',
                     )
 
         with mock.patch('share.search.daemon.sentry_client') as mock_sentry:
@@ -205,7 +205,7 @@ def pls_handle_messages_chunk(self, messages_chunk):
                             is_done=False,
                             index_message=messages.IndexMessage(messages_chunk.message_type, target_id),
                             status_code=429,
-                            error_label='too many!',
+                            error_text='too many!',
                         )
                     else:
                         yield messages.IndexMessageResponse(