(logging-log4cxx) branch master updated: Improve APRInitiializer interface in next ABI version (#378)

[swebb2066]

This is an automated email from the ASF dual-hosted git repository.

swebb2066 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


The following commit(s) were added to refs/heads/master by this push:
     new 4f605de7 Improve APRInitiializer interface in next ABI version (#378)
4f605de7 is described below

commit 4f605de7024cb237dda8d27d92e6ed4c1eaa4d47
Author: Stephen Webb <stephen.w...@ieee.org>
AuthorDate: Wed May 1 10:37:12 2024 +1000

    Improve APRInitiializer interface in next ABI version (#378)
---
 src/main/cpp/aprinitializer.cpp                   | 9 ++++++++-
 src/main/cpp/level.cpp                            | 1 -
 src/main/cpp/loggingevent.cpp                     | 2 +-
 src/main/include/log4cxx/helpers/aprinitializer.h | 3 +++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/cpp/aprinitializer.cpp b/src/main/cpp/aprinitializer.cpp
index f44e9864..454b7718 100644
--- a/src/main/cpp/aprinitializer.cpp
+++ b/src/main/cpp/aprinitializer.cpp
@@ -129,10 +129,17 @@ APRInitializer& APRInitializer::getInstance()
 }
 
 
+#if LOG4CXX_ABI_VERSION <= 15
 log4cxx_time_t APRInitializer::initialize()
 {
        return getInstance().m_priv->startTime;
 }
+#endif
+
+log4cxx_time_t APRInitializer::getStartTime()
+{
+       return getInstance().m_priv->startTime;
+}
 
 apr_pool_t* APRInitializer::getRootPool()
 {
@@ -173,7 +180,7 @@ const ObjectPtr& APRInitializer::findOrAddObject(size_t 
key, std::function<Objec
        if (m_priv->objects.empty())
        {
                // Ensure the internal logger has a longer life than other 
Log4cxx static data
-               LogLog::debug(LOG4CXX_STR("Log4cxx starting"));
+               LogLog::debug(LOG4CXX_STR("Started"));
        }
        auto pItem = m_priv->objects.find(key);
        if (m_priv->objects.end() == pItem)
diff --git a/src/main/cpp/level.cpp b/src/main/cpp/level.cpp
index 7e2e4dad..50fcfd12 100644
--- a/src/main/cpp/level.cpp
+++ b/src/main/cpp/level.cpp
@@ -85,7 +85,6 @@ Level::Level(int level1,
        const LogString& name1, int syslogEquivalent1)
        : level(level1), name(name1), syslogEquivalent(syslogEquivalent1)
 {
-       APRInitializer::initialize();
 }
 
 
diff --git a/src/main/cpp/loggingevent.cpp b/src/main/cpp/loggingevent.cpp
index f6eceddb..2c67447a 100644
--- a/src/main/cpp/loggingevent.cpp
+++ b/src/main/cpp/loggingevent.cpp
@@ -173,7 +173,7 @@ IMPLEMENT_LOG4CXX_OBJECT(LoggingEvent)
 //
 log4cxx_time_t LoggingEvent::getStartTime()
 {
-       return LOG4CXX_NS::helpers::APRInitializer::initialize();
+       return APRInitializer::getStartTime();
 }
 
 LoggingEvent::LoggingEvent() :
diff --git a/src/main/include/log4cxx/helpers/aprinitializer.h 
b/src/main/include/log4cxx/helpers/aprinitializer.h
index ea5945a3..f810127a 100644
--- a/src/main/include/log4cxx/helpers/aprinitializer.h
+++ b/src/main/include/log4cxx/helpers/aprinitializer.h
@@ -44,8 +44,11 @@ class FileWatchdog;
 class APRInitializer
 {
        public:
+#if LOG4CXX_ABI_VERSION <= 15
                static log4cxx_time_t initialize();
+#endif
                static apr_pool_t* getRootPool();
+               static log4cxx_time_t getStartTime();
                static apr_threadkey_t* getTlsKey();
                static bool isDestructed;