diff options
Diffstat (limited to 'yt_dlp/networking')
| -rw-r--r-- | yt_dlp/networking/_requests.py | 11 | ||||
| -rw-r--r-- | yt_dlp/networking/_websockets.py | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/yt_dlp/networking/_requests.py b/yt_dlp/networking/_requests.py index 00e4bdb49..7b19029bf 100644 --- a/yt_dlp/networking/_requests.py +++ b/yt_dlp/networking/_requests.py @@ -258,10 +258,10 @@ class RequestsRH(RequestHandler, InstanceStoreMixin): # Forward urllib3 debug messages to our logger logger = logging.getLogger('urllib3') - handler = Urllib3LoggingHandler(logger=self._logger) - handler.setFormatter(logging.Formatter('requests: %(message)s')) - handler.addFilter(Urllib3LoggingFilter()) - logger.addHandler(handler) + self.__logging_handler = Urllib3LoggingHandler(logger=self._logger) + self.__logging_handler.setFormatter(logging.Formatter('requests: %(message)s')) + self.__logging_handler.addFilter(Urllib3LoggingFilter()) + logger.addHandler(self.__logging_handler) # TODO: Use a logger filter to suppress pool reuse warning instead logger.setLevel(logging.ERROR) @@ -276,6 +276,9 @@ class RequestsRH(RequestHandler, InstanceStoreMixin): def close(self): self._clear_instances() + # Remove the logging handler that contains a reference to our logger + # See: https://github.com/yt-dlp/yt-dlp/issues/8922 + logging.getLogger('urllib3').removeHandler(self.__logging_handler) def _check_extensions(self, extensions): super()._check_extensions(extensions) diff --git a/yt_dlp/networking/_websockets.py b/yt_dlp/networking/_websockets.py index ed64080d6..159793204 100644 --- a/yt_dlp/networking/_websockets.py +++ b/yt_dlp/networking/_websockets.py @@ -90,10 +90,12 @@ class WebsocketsRH(WebSocketRequestHandler): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) + self.__logging_handlers = {} for name in ('websockets.client', 'websockets.server'): logger = logging.getLogger(name) handler = logging.StreamHandler(stream=sys.stdout) handler.setFormatter(logging.Formatter(f'{self.RH_NAME}: %(message)s')) + self.__logging_handlers[name] = handler logger.addHandler(handler) if self.verbose: logger.setLevel(logging.DEBUG) @@ -103,6 +105,12 @@ class WebsocketsRH(WebSocketRequestHandler): extensions.pop('timeout', None) extensions.pop('cookiejar', None) + def close(self): + # Remove the logging handler that contains a reference to our logger + # See: https://github.com/yt-dlp/yt-dlp/issues/8922 + for name, handler in self.__logging_handlers.items(): + logging.getLogger(name).removeHandler(handler) + def _send(self, request): timeout = float(request.extensions.get('timeout') or self.timeout) headers = self._merge_headers(request.headers) |