Skip to content

Commit c16c2ea

Browse files
committed
Clarify callsite flow
1 parent a786cc0 commit c16c2ea

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/structlog/processors.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -908,20 +908,24 @@ def __call__(
908908
self, logger: logging.Logger, name: str, event_dict: EventDict
909909
) -> EventDict:
910910
record: logging.LogRecord | None = event_dict.get("_record")
911-
from_structlog: bool | None = event_dict.get("_from_structlog")
911+
from_structlog: bool = event_dict.get("_from_structlog", False)
912+
912913
# If the event dictionary has a record, but it comes from structlog,
913914
# then the callsite parameters of the record will not be correct.
914915
if record is not None and not from_structlog:
915916
for mapping in self._record_mappings:
916917
event_dict[mapping.event_dict_key] = record.__dict__[
917918
mapping.record_attribute
918919
]
919-
else:
920-
frame, module = _find_first_app_frame_and_name(
921-
additional_ignores=self._additional_ignores
922-
)
923-
for parameter, handler in self._active_handlers:
924-
event_dict[parameter.value] = handler(module, frame)
920+
921+
return event_dict
922+
923+
frame, module = _find_first_app_frame_and_name(
924+
additional_ignores=self._additional_ignores
925+
)
926+
for parameter, handler in self._active_handlers:
927+
event_dict[parameter.value] = handler(module, frame)
928+
925929
return event_dict
926930

927931

0 commit comments

Comments
 (0)