|
4 | 4 | from pathlib import Path |
5 | 5 |
|
6 | 6 | import typer |
7 | | -from ellar.constants import LOG_LEVELS |
8 | 7 | from ellar.helper.enums import create_enums_from_list |
9 | 8 | from h11._connection import DEFAULT_MAX_INCOMPLETE_EVENT_SIZE |
10 | 9 | from uvicorn.config import ( |
11 | 10 | HTTP_PROTOCOLS, |
12 | 11 | INTERFACES, |
13 | 12 | LIFESPAN, |
| 13 | + LOG_LEVELS, |
14 | 14 | LOGGING_CONFIG, |
15 | 15 | LOOP_SETUPS, |
16 | 16 | SSL_PROTOCOL_VERSION, |
|
32 | 32 | "LOOP_CHOICES", *[key for key in LOOP_SETUPS.keys() if key != "none"] |
33 | 33 | ) |
34 | 34 | INTERFACE_CHOICES = create_enums_from_list("INTERFACES", *INTERFACES) |
| 35 | +_LOG_LEVELS = dict(**LOG_LEVELS, NOT_SET=0) |
| 36 | +LOG_LEVELS_CHOICES = create_enums_from_list("LOG_LEVELS", *list(_LOG_LEVELS.keys())) |
35 | 37 |
|
36 | 38 |
|
37 | 39 | def runserver( |
@@ -112,8 +114,8 @@ def runserver( |
112 | 114 | env_file: t.Optional[Path] = typer.Option( |
113 | 115 | None, show_default=True, exists=True, help="Environment configuration file." |
114 | 116 | ), |
115 | | - log_level: t.Optional[LOG_LEVELS] = typer.Option( |
116 | | - None, |
| 117 | + log_level: LOG_LEVELS_CHOICES = typer.Option( |
| 118 | + LOG_LEVELS_CHOICES.NOT_SET.value, |
117 | 119 | show_default=True, |
118 | 120 | help="Log level. [default: None]", |
119 | 121 | ), |
@@ -266,7 +268,7 @@ def runserver( |
266 | 268 | lifespan=lifespan.value, |
267 | 269 | env_file=env_file, |
268 | 270 | log_config=LOGGING_CONFIG if log_config is None else log_config, |
269 | | - log_level=_log_level.name, |
| 271 | + log_level=_log_level.value if _log_level.value != "NOT_SET" else None, |
270 | 272 | access_log=access_log, |
271 | 273 | interface=interface.value, |
272 | 274 | reload=reload, |
|
0 commit comments