Skip to content

Commit c977904

Browse files
Refactoring variables name
1 parent 0c8cb3b commit c977904

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

aws_lambda_powertools/logging/buffer/functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def _create_buffer_record(
1111
args: object,
1212
extra: Mapping[str, object] | None = None,
1313
) -> dict[str, Any]:
14-
caller_frame = inspect.stack()[2]
14+
caller_frame = inspect.stack()[3]
1515
timestamp = time.time()
1616

1717
return {

aws_lambda_powertools/logging/logger.py

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,9 @@ def __init__(
269269
"serialize_stacktrace": serialize_stacktrace,
270270
}
271271

272-
self._logger_buffer = logger_buffer
273-
if self._logger_buffer:
274-
self._buffer_cache = LoggerBufferCache(max_size_bytes=self._logger_buffer.max_size)
272+
self.buffer_config = logger_buffer
273+
if self.buffer_config:
274+
self.buffer_cache = LoggerBufferCache(max_size_bytes=self.buffer_config.max_size)
275275

276276
self._init_logger(formatter_options=formatter_options, log_level=level, **kwargs)
277277

@@ -513,14 +513,13 @@ def decorate(event, context, *args, **kwargs):
513513
# Execute the Lambda handler with provided event and context
514514
return lambda_handler(event, context, *args, **kwargs)
515515
except:
516-
# Re-raise any exceptions that occur during handler execution
517-
raise
518-
finally:
519516
# Flush the log buffer if configured to do so on uncaught errors
520517
# Ensures logging state is cleaned up even if an exception is raised
521518
if flush_buffer_on_uncaught_error:
522-
logger.debug("An error happened, flushing the buffer")
519+
logger.debug("Uncaught error detected, flushing log buffer before exit")
523520
self.flush_buffer()
521+
# Re-raise any exceptions that occur during handler execution
522+
raise
524523

525524
return decorate
526525

@@ -547,7 +546,7 @@ def debug(
547546
# Also for clarity over complexity
548547

549548
# Buffer is not active and we need to log immediately
550-
if not self._logger_buffer:
549+
if not self.buffer_config:
551550
return self._logger.debug(
552551
msg,
553552
*args,
@@ -590,7 +589,7 @@ def info(
590589
# Also for clarity over complexity
591590

592591
# Buffer is not active and we need to log immediately
593-
if not self._logger_buffer:
592+
if not self.buffer_config:
594593
return self._logger.info(
595594
msg,
596595
*args,
@@ -601,7 +600,7 @@ def info(
601600
)
602601

603602
# Bypass buffer when log severity meets or exceeds configured minimum
604-
if _check_minimum_buffer_log_level(self._logger_buffer.minimum_log_level, "INFO"):
603+
if _check_minimum_buffer_log_level(self.buffer_config.minimum_log_level, "INFO"):
605604
return self._logger.info(
606605
msg,
607606
*args,
@@ -644,7 +643,7 @@ def warning(
644643
# Also for clarity over complexity
645644

646645
# Buffer is not active and we need to log immediately
647-
if not self._logger_buffer:
646+
if not self.buffer_config:
648647
return self._logger.warning(
649648
msg,
650649
*args,
@@ -655,7 +654,7 @@ def warning(
655654
)
656655

657656
# Bypass buffer when log severity meets or exceeds configured minimum
658-
if _check_minimum_buffer_log_level(self._logger_buffer.minimum_log_level, "WARNING"):
657+
if _check_minimum_buffer_log_level(self.buffer_config.minimum_log_level, "WARNING"):
659658
return self._logger.warning(
660659
msg,
661660
*args,
@@ -693,7 +692,7 @@ def error(
693692
# 2. If auto-flush enabled, trigger complete buffer processing
694693
# 3. Error log is not "bufferable", so ensure error log is immediately available
695694

696-
if self._logger_buffer and self._logger_buffer.flush_on_error:
695+
if self.buffer_config and self.buffer_config.flush_on_error:
697696
self.flush_buffer()
698697

699698
return self._logger.error(
@@ -722,7 +721,7 @@ def critical(
722721
# 1. Buffer configuration checked for immediate flush
723722
# 2. If auto-flush enabled, trigger complete buffer processing
724723
# 3. Critical log is not "bufferable", so ensure error log is immediately available
725-
if self._logger_buffer and self._logger_buffer.flush_on_error:
724+
if self.buffer_config and self.buffer_config.flush_on_error:
726725
self.flush_buffer()
727726

728727
return self._logger.critical(
@@ -751,7 +750,7 @@ def exception(
751750
# 1. Buffer configuration checked for immediate flush
752751
# 2. If auto-flush enabled, trigger complete buffer processing
753752
# 3. Exception log is not "bufferable", so ensure error log is immediately available
754-
if self._logger_buffer and self._logger_buffer.flush_on_error:
753+
if self.buffer_config and self.buffer_config.flush_on_error:
755754
self.flush_buffer()
756755

757756
return self._logger.exception(
@@ -1102,7 +1101,7 @@ def _add_log_record_to_buffer(
11021101

11031102
if tracer_id:
11041103
log_record: dict[str, Any] = _create_buffer_record(level=level, msg=msg, args=args, extra=extra)
1105-
self._buffer_cache.add(tracer_id, log_record)
1104+
self.buffer_cache.add(tracer_id, log_record)
11061105

11071106
def flush_buffer(self) -> None:
11081107
"""
@@ -1127,7 +1126,7 @@ def flush_buffer(self) -> None:
11271126
return
11281127

11291128
# is buffer empty? return
1130-
buffer = self._buffer_cache.get(tracer_id)
1129+
buffer = self.buffer_cache.get(tracer_id)
11311130
if not buffer:
11321131
return
11331132

@@ -1136,7 +1135,7 @@ def flush_buffer(self) -> None:
11361135
self._create_and_flush_log_record(log_line)
11371136

11381137
# Has items evicted?
1139-
if self._buffer_cache.has_items_evicted(tracer_id):
1138+
if self.buffer_cache.has_items_evicted(tracer_id):
11401139
warnings.warn(
11411140
message="Some logs are not displayed because they were evicted from the buffer. "
11421141
"Increase buffer size to store more logs in the buffer",
@@ -1145,7 +1144,7 @@ def flush_buffer(self) -> None:
11451144
)
11461145

11471146
# Clear the entire cache
1148-
self._buffer_cache.clear()
1147+
self.buffer_cache.clear()
11491148

11501149

11511150
def set_package_logger(

0 commit comments

Comments
 (0)