Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert logging file name modification #1543

Merged
merged 1 commit into from Jun 27, 2022
Merged

Revert logging file name modification #1543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ files =
uvicorn/middleware/wsgi.py,
uvicorn/supervisors/watchfilesreload.py,
uvicorn/supervisors/watchgodreload.py,
uvicorn/_logging.py,
uvicorn/logging.py,
uvicorn/middleware/asgi2.py,
uvicorn/server.py,
uvicorn/__init__.py,
Expand Down
2 changes: 1 addition & 1 deletion tests/middleware/test_message_logger.py
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
import pytest

from tests.middleware.test_logging import caplog_for_logger
from uvicorn._logging import TRACE_LOG_LEVEL
from uvicorn.logging import TRACE_LOG_LEVEL
from uvicorn.middleware.message_logger import MessageLoggerMiddleware


Expand Down
6 changes: 3 additions & 3 deletions uvicorn/config.py
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@

from h11._connection import DEFAULT_MAX_INCOMPLETE_EVENT_SIZE

from uvicorn._logging import TRACE_LOG_LEVEL
from uvicorn.logging import TRACE_LOG_LEVEL

if sys.version_info < (3, 8): # pragma: py-gte-38
from typing_extensions import Literal
Expand Down Expand Up @@ -97,12 +97,12 @@
"disable_existing_loggers": False,
"formatters": {
"default": {
"()": "uvicorn._logging.DefaultFormatter",
"()": "uvicorn.logging.DefaultFormatter",
"fmt": "%(levelprefix)s %(message)s",
"use_colors": None,
},
"access": {
"()": "uvicorn._logging.AccessFormatter",
"()": "uvicorn.logging.AccessFormatter",
"fmt": '%(levelprefix)s %(client_addr)s - "%(request_line)s" %(status_code)s', # noqa: E501
},
},
Expand Down
0 uvicorn/_logging.py → uvicorn/logging.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion uvicorn/middleware/message_logger.py
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
WWWScope,
)

from uvicorn._logging import TRACE_LOG_LEVEL
from uvicorn.logging import TRACE_LOG_LEVEL

PLACEHOLDER_FORMAT = {
"body": "<{length} bytes>",
Expand Down
2 changes: 1 addition & 1 deletion uvicorn/protocols/http/h11_impl.py
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@

import h11

from uvicorn._logging import TRACE_LOG_LEVEL
from uvicorn.config import Config
from uvicorn.logging import TRACE_LOG_LEVEL
from uvicorn.protocols.http.flow_control import (
CLOSE_HEADER,
HIGH_WATER_LIMIT,
Expand Down
2 changes: 1 addition & 1 deletion uvicorn/protocols/http/httptools_impl.py
View file
Open in desktop
Expand Up @@ -10,8 +10,8 @@

import httptools

from uvicorn._logging import TRACE_LOG_LEVEL
from uvicorn.config import Config
from uvicorn.logging import TRACE_LOG_LEVEL
from uvicorn.protocols.http.flow_control import (
CLOSE_HEADER,
HIGH_WATER_LIMIT,
Expand Down
2 changes: 1 addition & 1 deletion uvicorn/protocols/websockets/websockets_impl.py
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
import websockets
from websockets.extensions.permessage_deflate import ServerPerMessageDeflateFactory

from uvicorn._logging import TRACE_LOG_LEVEL
from uvicorn.logging import TRACE_LOG_LEVEL
from uvicorn.protocols.utils import get_local_addr, get_remote_addr, is_ssl


Expand Down
2 changes: 1 addition & 1 deletion uvicorn/protocols/websockets/wsproto_impl.py
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
from wsproto.extensions import PerMessageDeflate
from wsproto.utilities import RemoteProtocolError

from uvicorn._logging import TRACE_LOG_LEVEL
from uvicorn.logging import TRACE_LOG_LEVEL
from uvicorn.protocols.utils import get_local_addr, get_remote_addr, is_ssl


Expand Down