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

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


The following commit(s) were added to refs/heads/fix_benchmark_checks by this 
push:
     new bd7db3de Use LoggerRepository::exists properly
bd7db3de is described below

commit bd7db3deefed194eded87eec71f1723b90a04879
Author: Stephen Webb <[email protected]>
AuthorDate: Wed Feb 14 16:24:04 2024 +1100

    Use LoggerRepository::exists properly
---
 src/test/cpp/benchmark/benchmark.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/test/cpp/benchmark/benchmark.cpp 
b/src/test/cpp/benchmark/benchmark.cpp
index 75e53204..f6ade119 100644
--- a/src/test/cpp/benchmark/benchmark.cpp
+++ b/src/test/cpp/benchmark/benchmark.cpp
@@ -103,16 +103,15 @@ public: // Class methods
 
        static LoggerPtr getLogger(const LogString& pattern = LogString())
        {
+               LogString name = LOG4CXX_STR("benchmark.fixture");
                LoggerPtr result;
                setDefaultAppender();
                auto r = LogManager::getLoggerRepository();
                if (pattern.empty())
-                       result = r->getLogger(LOG4CXX_STR("benchmark.fixture"));
-               else if (r->exists(LOG4CXX_STR("benchmark.fixture.") + pattern))
-                       result = r->getLogger(LOG4CXX_STR("benchmark.fixture.") 
+ pattern);
-               else
+                       result = r->getLogger(name);
+               else if (!(result = r->exists(name += LOG4CXX_STR(".") + 
pattern)))
                {
-                       result = r->getLogger(LOG4CXX_STR("benchmark.fixture.") 
+ pattern);
+                       result = r->getLogger(name);
                        result->setAdditivity(false);
                        result->setLevel(Level::getInfo());
                        auto nullWriter = 
std::make_shared<NullWriterAppender>(std::make_shared<PatternLayout>(pattern));
@@ -124,13 +123,11 @@ public: // Class methods
 
        static LoggerPtr getAsyncLogger()
        {
-               LoggerPtr result;
+               LogString name = LOG4CXX_STR("benchmark.fixture.async");
                setDefaultAppender();
                auto r = LogManager::getLoggerRepository();
-               LogString name = LOG4CXX_STR("benchmark.fixture.async");
-               if (r->exists(name))
-                       result = r->getLogger(name);
-               else
+               LoggerPtr result = r->exists(name);
+               if (!result)
                {
                        auto nullWriter = 
r->getRootLogger()->getAppender(LOG4CXX_STR("NullWriterAppender"));
                        auto asyncAppender = std::make_shared<AsyncAppender>();

Reply via email to