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 9f44110b Log recoverable fault messages at the warning level (#530)
9f44110b is described below

commit 9f44110bb807a8006dfe77f27132e5441c9d887f
Author: Stephen Webb <[email protected]>
AuthorDate: Mon Sep 1 11:42:00 2025 +1000

    Log recoverable fault messages at the warning level (#530)
    
    * Prevent MacOS CI build failure
    
    * Using a closed appender now just a warning
---
 .github/workflows/log4cxx-macos.yml     | 4 +++-
 src/main/cpp/appenderskeleton.cpp       | 2 +-
 src/main/cpp/socketappenderskeleton.cpp | 6 +++---
 src/main/cpp/syslogappender.cpp         | 4 ++--
 src/main/cpp/writerappender.cpp         | 2 +-
 src/test/cpp/helpers/localechanger.cpp  | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/log4cxx-macos.yml 
b/.github/workflows/log4cxx-macos.yml
index e578ce1e..1ab41d8e 100644
--- a/.github/workflows/log4cxx-macos.yml
+++ b/.github/workflows/log4cxx-macos.yml
@@ -57,7 +57,9 @@ jobs:
         if [ ${{ matrix.odbc }} == ON ]; then brew install unixodbc; fi
         if [ ${{ matrix.qt }} == ON ]; then brew install qt; fi
         if [ ${{ matrix.cxx }} == "g++-14" -a $(cmake --version | head -1 | 
awk '{split($3, a, "."); print a[1]}') -lt 4 ]
-        then brew install cmake ninja
+        then
+          brew uninstall cmake
+          brew install cmake ninja
         fi
 
     - name: 'configure and build'
diff --git a/src/main/cpp/appenderskeleton.cpp 
b/src/main/cpp/appenderskeleton.cpp
index 3a5e7495..76eb3dfd 100644
--- a/src/main/cpp/appenderskeleton.cpp
+++ b/src/main/cpp/appenderskeleton.cpp
@@ -99,7 +99,7 @@ void AppenderSkeleton::doAppendImpl(const 
spi::LoggingEventPtr& event, Pool& poo
 {
        if (m_priv->closed)
        {
-               LogLog::error(((LogString) LOG4CXX_STR("Attempted to append to 
closed appender named ["))
+               LogLog::warn(LOG4CXX_STR("Attempted to append to closed 
appender named [")
                        + m_priv->name + LOG4CXX_STR("]."));
                return;
        }
diff --git a/src/main/cpp/socketappenderskeleton.cpp 
b/src/main/cpp/socketappenderskeleton.cpp
index fdba18a8..a0bdecfa 100644
--- a/src/main/cpp/socketappenderskeleton.cpp
+++ b/src/main/cpp/socketappenderskeleton.cpp
@@ -105,7 +105,7 @@ void SocketAppenderSkeleton::connect(Pool& p)
                        msg += LOG4CXX_STR("].");
 
                        fireConnector(); // fire the connector thread
-                       LogLog::error(msg, e);
+                       LogLog::warn(msg, e);
                }
        }
 }
@@ -204,7 +204,7 @@ void SocketAppenderSkeleton::retryConnect()
                }
                catch (ConnectException& e)
                {
-                       LogLog::error(LOG4CXX_STR("Remote host ")
+                       LogLog::warn(LOG4CXX_STR("Remote host ")
                                + _priv->address->toString()
                                + LOG4CXX_STR(" refused connection."), e);
                }
@@ -214,7 +214,7 @@ void SocketAppenderSkeleton::retryConnect()
                                + _priv->address->toString() + 
LOG4CXX_STR(":"));
                        StringHelper::toString(_priv->port, p, msg);
                        msg += LOG4CXX_STR("].");
-                       LogLog::error(msg, e);
+                       LogLog::warn(msg, e);
                }
 
                if (_priv->reconnectionDelay > 0)
diff --git a/src/main/cpp/syslogappender.cpp b/src/main/cpp/syslogappender.cpp
index 77540b6f..aee1ae80 100644
--- a/src/main/cpp/syslogappender.cpp
+++ b/src/main/cpp/syslogappender.cpp
@@ -87,7 +87,7 @@ void SyslogAppender::initSyslogFacilityStr()
                LogString msg(LOG4CXX_STR("\""));
                StringHelper::toString(_priv->syslogFacility, p, msg);
                msg.append(LOG4CXX_STR("\" is an unknown syslog facility. 
Defaulting to \"USER\"."));
-               LogLog::error(msg);
+               LogLog::warn(msg);
                _priv->syslogFacility = LOG_USER;
                _priv->facilityStr = LOG4CXX_STR("user:");
        }
@@ -446,7 +446,7 @@ void SyslogAppender::setFacility(const LogString& 
facilityName)
 
        if (_priv->syslogFacility == LOG_UNDEF)
        {
-               LogLog::error(LOG4CXX_STR("[") + facilityName +
+               LogLog::warn(LOG4CXX_STR("[") + facilityName +
                        LOG4CXX_STR("] is an unknown syslog facility. 
Defaulting to [USER]."));
                _priv->syslogFacility = LOG_USER;
        }
diff --git a/src/main/cpp/writerappender.cpp b/src/main/cpp/writerappender.cpp
index 1d49236b..1be53e87 100644
--- a/src/main/cpp/writerappender.cpp
+++ b/src/main/cpp/writerappender.cpp
@@ -178,7 +178,7 @@ void WriterAppender::closeWriter()
                }
                catch (IOException& e)
                {
-                       LogLog::error(LogString(LOG4CXX_STR("Could not close 
writer for WriterAppender named ")) + _priv->name, e);
+                       LogLog::warn(LOG4CXX_STR("Could not close writer for 
WriterAppender named ") + _priv->name, e);
                }
        }
 
diff --git a/src/test/cpp/helpers/localechanger.cpp 
b/src/test/cpp/helpers/localechanger.cpp
index a1aeb9eb..023385a6 100644
--- a/src/test/cpp/helpers/localechanger.cpp
+++ b/src/test/cpp/helpers/localechanger.cpp
@@ -45,7 +45,7 @@ LocaleChanger::LocaleChanger(const char* locale)
                LogString errorMsg;
                errorMsg.append(lsMsg);
                errorMsg.append(LOG4CXX_STR(" - in LocaleChanger"));
-               LogLog::error(errorMsg);
+               LogLog::warn(errorMsg);
        }
 }
 

Reply via email to