Skip to content

Commit b4f71cf

Browse files
committed
fixed failing test
1 parent fd84c44 commit b4f71cf

File tree

3 files changed

+30
-13
lines changed

3 files changed

+30
-13
lines changed

ellar/common/constants.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def __deepcopy__(
128128

129129
NOT_SET: Any = NOT_SET_TYPE()
130130

131-
131+
ELLAR_LOG_FMT_STRING = "%(levelname)s: [%(name)s] %(message)s"
132132
DEFAULT_LOGGING = {
133133
"version": 1,
134134
"disable_existing_loggers": False,
@@ -142,6 +142,10 @@ def __deepcopy__(
142142
"()": "uvicorn.logging.AccessFormatter",
143143
"fmt": '%(levelprefix)s %(client_addr)s - "%(request_line)s" %(status_code)s',
144144
},
145+
"ellar-formatter": {
146+
"()": "logging.Formatter",
147+
"fmt": ELLAR_LOG_FMT_STRING,
148+
},
145149
},
146150
"handlers": {
147151
"default": {
@@ -154,6 +158,11 @@ def __deepcopy__(
154158
"class": "logging.StreamHandler",
155159
"stream": "ext://sys.stdout",
156160
},
161+
"ellar-default": {
162+
"formatter": "ellar-formatter",
163+
"class": "logging.StreamHandler",
164+
"stream": "ext://sys.stdout",
165+
},
157166
"console": {
158167
"class": "logging.StreamHandler",
159168
},
@@ -163,14 +172,14 @@ def __deepcopy__(
163172
"uvicorn.error": {"level": "INFO"},
164173
"uvicorn.access": {"handlers": ["access"], "level": "INFO", "propagate": False},
165174
"ellar": {
166-
"handlers": ["default"],
175+
"handlers": ["ellar-default"],
167176
"level": "INFO",
168177
"propagate": False,
169178
},
170179
"ellar.request": {
171-
"handlers": ["default"],
180+
"handlers": ["ellar-default"],
172181
"level": "INFO",
173-
"propagate": True,
182+
"propagate": False,
174183
},
175184
},
176185
}

ellar/common/params/resolvers/parameter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ async def get_request_body(self, ctx: IExecutionContext) -> t.Any:
153153
body_bytes = json_body
154154
return body_bytes
155155
except json.JSONDecodeError as e:
156-
request_logger.error("JSONDecodeError: ", exc_info=e)
156+
request_logger.error("JSONDecodeError: ", exc_info=True)
157157
raise RequestValidationError([ErrorWrapper(e, ("body", e.pos))]) from e
158158
except Exception as e: # pragma: no cover
159159
request_logger.error("Unable to parse the body: ", exc_info=e)
@@ -191,7 +191,7 @@ async def get_request_body(self, ctx: IExecutionContext) -> t.Any:
191191
body_bytes = await request.form()
192192
return body_bytes
193193
except Exception as e:
194-
request_logger.error("Unable to parse the body: ", exc_info=e)
194+
request_logger.error("Unable to parse the body: ", exc_info=True)
195195
raise HTTPException(
196196
status_code=400, detail="There was an error parsing the body"
197197
) from e

ellar/core/main.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from ellar.auth import IIdentitySchemes
66
from ellar.auth.handlers import AuthenticationHandlerType
77
from ellar.common.compatible import cached_property
8-
from ellar.common.constants import DEFAULT_LOGGING, LOG_LEVELS
8+
from ellar.common.constants import LOG_LEVELS
99
from ellar.common.datastructures import State, URLPath
1010
from ellar.common.interfaces import IExceptionHandler, IExceptionMiddlewareService
1111
from ellar.common.logger import logger
@@ -90,12 +90,20 @@ def _config_logging(self) -> None:
9090
if self.config.LOG_LEVEL
9191
else LOG_LEVELS.info.value
9292
)
93-
94-
logging_config = self.config.LOGGING_CONFIG or DEFAULT_LOGGING
95-
logging.config.dictConfig(logging_config)
96-
97-
logging.getLogger("ellar").setLevel(log_level)
98-
logging.getLogger("ellar.request").setLevel(log_level)
93+
logger_ = logging.getLogger("ellar")
94+
if not logger_.handlers:
95+
formatter = logging.Formatter("%(levelname)s: [%(name)s] %(message)s")
96+
stream_handler = logging.StreamHandler()
97+
# file_handler = logging.FileHandler("my_app.log")
98+
# file_handler.setFormatter(formatter)
99+
# logger_.addHandler(file_handler)
100+
stream_handler.setFormatter(formatter)
101+
logger_.addHandler(stream_handler)
102+
103+
logger_.setLevel(log_level)
104+
else:
105+
logging.getLogger("ellar").setLevel(log_level)
106+
logging.getLogger("ellar.request").setLevel(log_level)
99107

100108
logger.info(f"APP SETTINGS MODULE: {self.config.config_module}")
101109
logger.debug("ELLAR LOGGER CONFIGURED")

0 commit comments

Comments
 (0)