Merge branch 'release/4.1.0'

1 files changed, 9 insertions, 11 deletions

diff --git a/src/components/utils/src/auto_trace.cc b/src/components/utils/src/auto_trace.cc
index 5104851a51..0379630319 100644
--- a/src/components/utils/src/auto_trace.cc
+++ b/src/components/utils/src/auto_trace.cc
@@ -38,30 +38,28 @@
 
 namespace logger {
 
-AutoTrace::AutoTrace(
-  log4cxx::LoggerPtr logger,
-  const log4cxx::spi::LocationInfo& location) :
-  logger_(logger), location_(location) {
-  if (logger_->isTraceEnabled()) {
+AutoTrace::AutoTrace(log4cxx::LoggerPtr logger,
+                     const log4cxx::spi::LocationInfo& location)
+    : logger_(logger), location_(location) {
+  if (logger::logs_enabled() && logger_->isTraceEnabled()) {
     push_log(logger_,
              ::log4cxx::Level::getTrace(),
              "Enter",
              apr_time_now(),
              location_,
-             ::log4cxx::spi::LoggingEvent::getCurrentThreadName()
-    );
+             ::log4cxx::spi::LoggingEvent::getCurrentThreadName());
   }
 }
 
 AutoTrace::~AutoTrace() {
-  if (logger_->isTraceEnabled()) {
+  if (logger::logs_enabled() && logger_->isTraceEnabled()) {
     push_log(logger_,
              ::log4cxx::Level::getTrace(),
              "Exit",
              apr_time_now(),
-             location_, // the location corresponds rather to creation of autotrace object than to deletion
-             ::log4cxx::spi::LoggingEvent::getCurrentThreadName()
-    );
+             location_,  // the location corresponds rather to creation of
+                         // autotrace object than to deletion
+             ::log4cxx::spi::LoggingEvent::getCurrentThreadName());
   }
 }