remove personal logger instance

Author: rekby

ydb/_topic_reader/topic_reader_asyncio.py

@@ -28,7 +28,7 @@
 from .._errors import check_retriable_error
 import logging
 
-_module_logger = logging.getLogger(__name__)
+logger = logging.getLogger(__name__)
 
 
 class TopicReaderError(YdbError):
@@ -65,7 +65,6 @@ class PublicAsyncIOReader:
     _closed: bool
     _reconnector: ReaderReconnector
     _parent: typing.Any  # need for prevent close parent client by GC
-    _logger: logging.Logger
 
     def __init__(
         self,
@@ -74,14 +73,8 @@ def __init__(
         *,
         _parent=None,
     ):
-        if settings.logger:
-            self._logger = settings.logger
-        else:
-            self._logger = _module_logger
-
         self._loop = asyncio.get_running_loop()
         self._closed = False
-        self._logger = settings.logger
         self._reconnector = ReaderReconnector(driver, settings)
         self._parent = _parent
 
@@ -149,18 +142,12 @@ class ReaderReconnector:
     _settings: topic_reader.PublicReaderSettings
     _driver: Driver
     _background_tasks: Set[Task]
-    _logger: logging.Logger
 
     _state_changed: asyncio.Event
     _stream_reader: Optional["ReaderStream"]
     _first_error: asyncio.Future[YdbError]
 
     def __init__(self, driver: Driver, settings: topic_reader.PublicReaderSettings):
-        if settings.logger:
-            self._logger = settings.logger
-        else:
-            self._logger = _module_logger
-
         self._id = self._static_reader_reconnector_counter.inc_and_get()
         self._settings = settings
         self._driver = driver
@@ -249,7 +236,6 @@ class ReaderStream:
     _buffer_size_bytes: int  # use for init request, then for debug purposes only
     _decode_executor: concurrent.futures.Executor
     _decoders: Dict[int, typing.Callable[[bytes], bytes]]  # dict[codec_code] func(encoded_bytes)->decoded_bytes
-    _logger: logging.Logger
 
     if typing.TYPE_CHECKING:
         _batches_to_decode: asyncio.Queue[datatypes.PublicBatch]
@@ -271,11 +257,6 @@ def __init__(
         settings: topic_reader.PublicReaderSettings,
         get_token_function: Optional[Callable[[], str]] = None,
     ):
-        if settings.logger:
-            self._logger = settings.logger
-        else:
-            self._logger = _module_logger
-
         self._loop = asyncio.get_running_loop()
         self._id = ReaderStream._static_id_counter.inc_and_get()
         self._reader_reconnector_id = reader_reconnector_id
@@ -445,8 +426,8 @@ async def _read_messages_loop(self):
                         raise issues.UnexpectedGrpcMessage(
                             "Unexpected message in _read_messages_loop: %s" % type(message.server_message)
                         )
-                except issues.UnexpectedGrpcMessage:
-                    self._logger.exception("unexpected message in stream reader")
+                except issues.UnexpectedGrpcMessage as e:
+                    logger.exception("unexpected message in stream reader: %s" % e)
 
                 self._state_changed.set()
         except Exception as e:

ydb/_topic_reader/topic_reader_asyncio_test.py

@@ -1127,18 +1127,10 @@ async def test_update_token(self, stream):
 
         await reader.close()
 
-    async def test_read_unknown_message(self, stream, stream_reader):
+    async def test_read_unknown_message(self, stream, stream_reader, caplog):
         class TestMessage:
             pass
 
-        logged = asyncio.Event()
-
-        def set_logged(*args, **kwargs):
-            logged.set()
-
-        stream_reader._logger = mock.Mock()
-        stream_reader._logger.exception = mock.Mock(side_effect=set_logged)
-
         # noinspection PyTypeChecker
         stream.from_server.put_nowait(
             StreamReadMessage.FromServer(
@@ -1149,10 +1141,14 @@ def set_logged(*args, **kwargs):
                 server_message=TestMessage(),
             )
         )
-        await wait_for_fast(logged.wait())
 
-        stream_reader._logger.exception.assert_called_once()
+        def logged():
+            for rec in caplog.records:
+                if TestMessage.__name__ in rec.message:
+                    return True
+            return False
 
+        await wait_condition(logged)
 
 @pytest.mark.asyncio
 class TestReaderReconnector: