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

Fix type hints for log_config #1539

Merged
merged 3 commits into from Jun 24, 2022
Merged

Fix type hints for log_config #1539

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b723a1
Fix type hints for log_config
wch Jun 24, 2022
2b1deec
Merge branch 'master' into fix-type
Kludex Jun 24, 2022
d2828af
Update uvicorn/main.py
Kludex Jun 24, 2022
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
5 changes: 3 additions & 2 deletions uvicorn/config.py
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@
from pathlib import Path
from typing import (
TYPE_CHECKING,
Any,
Awaitable,
Callable,
Dict,
Expand Down Expand Up @@ -91,7 +92,7 @@
SSL_PROTOCOL_VERSION: int = ssl.PROTOCOL_TLS_SERVER


LOGGING_CONFIG: dict = {
LOGGING_CONFIG: Dict[str, Any] = {
"version": 1,
"disable_existing_loggers": False,
"formatters": {
Expand Down Expand Up @@ -222,7 +223,7 @@ def __init__(
ws_per_message_deflate: Optional[bool] = True,
lifespan: LifespanType = "auto",
env_file: Optional[Union[str, os.PathLike]] = None,
log_config: Optional[Union[dict, str]] = LOGGING_CONFIG,
log_config: Optional[Union[Dict[str, Any], str]] = LOGGING_CONFIG,
log_level: Optional[Union[str, int]] = None,
access_log: bool = True,
use_colors: Optional[bool] = None,
Expand Down
2 changes: 1 addition & 1 deletion uvicorn/main.py
View file
Open in desktop
Expand Up @@ -478,7 +478,7 @@ def run(
reload_delay: float = 0.25,
workers: typing.Optional[int] = None,
env_file: typing.Optional[str] = None,
log_config: typing.Optional[typing.Union[dict, str]] = None,
log_config: typing.Optional[typing.Union[typing.Dict[str, typing.Any], str]] = None,
log_level: typing.Optional[str] = None,
access_log: bool = True,
proxy_headers: bool = True,
Expand Down