Simplify

Author: NoahStapp

.evergreen/scripts/run_tests.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+import logging
 import os
 import platform
 import shutil
@@ -172,6 +173,9 @@ def run() -> None:
         handle_aws_lambda()
         return
 
+    if os.environ.get("DEBUG_LOG"):
+        TEST_ARGS.extend(f"-o log_cli_level={logging.DEBUG}".split())
+
     # Run local tests.
     ret = pytest.main(TEST_ARGS + sys.argv[1:])
     if ret != 0:

CONTRIBUTING.md

@@ -352,7 +352,7 @@ If you are running one of the `no-responder` tests, omit the `run-server` step.
 ## Enable Debug Logs
 
 - Use `-o log_cli_level="DEBUG" -o log_cli=1` with `just test` or `pytest` to output all debug logs to the terminal. **Warning**: This will output a huge amount of logs.
-- Add `log_cli_level = "DEBUG` to the `tool.pytest.ini_options` section in `pyproject.toml` to enable debug logs in this manner by default on your machine.
+- Add `log_cli=1` and `log_cli_level="DEBUG"` to the `tool.pytest.ini_options` section in `pyproject.toml` to enable debug logs in this manner by default on your machine.
 - Set `DEBUG_LOG=1` and run `just setup-tests`, `just-test`, or `pytest` to enable debug logs only for failed tests.
 - Finally, you can use `just setup-tests --debug-log`.
 - For evergreen patch builds, you can use `evergreen patch --param DEBUG_LOG=1` to enable debug logs for failed tests in the patch.

pymongo/logger.py

@@ -15,7 +15,6 @@
 
 import enum
 import logging
-import logging.handlers
 import os
 import warnings
 from typing import Any
@@ -96,13 +95,6 @@ class _SDAMStatusMessage(str, enum.Enum):
     ConnectionCheckOutFailedReason.TIMEOUT: "Connection exceeded the specified timeout",
 }
 
-if os.environ.get("DEBUG_LOG"):
-    _COMMAND_LOGGER.setLevel(logging.DEBUG)
-    _SERVER_SELECTION_LOGGER.setLevel(logging.DEBUG)
-    _CONNECTION_LOGGER.setLevel(logging.DEBUG)
-    _CLIENT_LOGGER.setLevel(logging.DEBUG)
-    _SDAM_LOGGER.setLevel(logging.DEBUG)
-
 
 def _log_client_error() -> None:
     # This is called from a daemon thread so check for None to account for interpreter shutdown.

pyproject.toml

@@ -98,7 +98,6 @@ minversion = "7"
 addopts = ["-ra", "--strict-config", "--strict-markers", "--junitxml=xunit-results/TEST-results.xml", "-m default or default_async"]
 testpaths = ["test"]
 log_cli_level = "INFO"
-log_cli = true
 faulthandler_timeout = 1500
 asyncio_default_fixture_loop_scope = "session"
 xfail_strict = true