You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2021/11/06 01:48:36 UTC
[logging-log4cxx] branch LOGCXX-510 updated (1d6407e -> e81a567)
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a change to branch LOGCXX-510
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git.
from 1d6407e fix time based rolling test
new 8b4c5dd add destructor for HTMLLayout
new e81a567 Formatted code according to astyle
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/cpp/action.cpp | 2 +-
src/main/cpp/andfilter.cpp | 11 +-
src/main/cpp/appenderattachableimpl.cpp | 10 +-
src/main/cpp/appenderskeleton.cpp | 30 ++--
src/main/cpp/asyncappender.cpp | 7 +-
src/main/cpp/bufferedwriter.cpp | 3 +-
src/main/cpp/bytearrayinputstream.cpp | 5 +-
src/main/cpp/bytearrayoutputstream.cpp | 3 +-
src/main/cpp/bytebuffer.cpp | 5 +-
src/main/cpp/cacheddateformat.cpp | 5 +-
src/main/cpp/colorendpatternconverter.cpp | 2 +-
src/main/cpp/colorstartpatternconverter.cpp | 54 ++++---
src/main/cpp/consoleappender.cpp | 5 +-
src/main/cpp/cyclicbuffer.cpp | 5 +-
src/main/cpp/datagrampacket.cpp | 3 +-
src/main/cpp/datagramsocket.cpp | 3 +-
src/main/cpp/datepatternconverter.cpp | 11 +-
src/main/cpp/defaultrepositoryselector.cpp | 5 +-
src/main/cpp/domconfigurator.cpp | 24 ++-
src/main/cpp/fallbackerrorhandler.cpp | 5 +-
src/main/cpp/fileappender.cpp | 3 +-
src/main/cpp/fileinputstream.cpp | 5 +-
src/main/cpp/fileoutputstream.cpp | 5 +-
src/main/cpp/filerenameaction.cpp | 9 +-
src/main/cpp/filter.cpp | 5 +-
src/main/cpp/formattinginfo.cpp | 7 +-
src/main/cpp/gzcompressaction.cpp | 13 +-
src/main/cpp/hierarchy.cpp | 15 +-
src/main/cpp/htmllayout.cpp | 7 +-
src/main/cpp/levelmatchfilter.cpp | 5 +-
src/main/cpp/levelrangefilter.cpp | 7 +-
src/main/cpp/literalpatternconverter.cpp | 7 +-
src/main/cpp/locale.cpp | 5 +-
src/main/cpp/logger.cpp | 29 ++--
src/main/cpp/loggermatchfilter.cpp | 7 +-
src/main/cpp/loggingevent.cpp | 12 +-
src/main/cpp/loggingeventpatternconverter.cpp | 3 +-
src/main/cpp/mapfilter.cpp | 7 +-
src/main/cpp/namepatternconverter.cpp | 7 +-
src/main/cpp/odbcappender.cpp | 2 +-
src/main/cpp/patternconverter.cpp | 5 +-
src/main/cpp/patternlayout.cpp | 9 +-
src/main/cpp/propertiespatternconverter.cpp | 7 +-
src/main/cpp/propertyconfigurator.cpp | 16 +-
src/main/cpp/rollingfileappender.cpp | 5 +-
src/main/cpp/smtpappender.cpp | 10 +-
src/main/cpp/sockethubappender.cpp | 9 +-
src/main/cpp/socketoutputstream.cpp | 3 +-
src/main/cpp/stringmatchfilter.cpp | 9 +-
src/main/cpp/telnetappender.cpp | 13 +-
src/main/cpp/threadutility.cpp | 117 +++++++++-----
.../cpp/throwableinformationpatternconverter.cpp | 9 +-
src/main/cpp/writerappender.cpp | 6 +-
src/main/cpp/xmllayout.cpp | 7 +-
src/main/cpp/xmlsocketappender.cpp | 9 +-
src/main/cpp/zipcompressaction.cpp | 11 +-
src/main/include/log4cxx/appenderskeleton.h | 2 +-
src/main/include/log4cxx/asyncappender.h | 4 +-
src/main/include/log4cxx/consoleappender.h | 4 +-
src/main/include/log4cxx/db/odbcappender.h | 2 +-
src/main/include/log4cxx/fileappender.h | 6 +-
src/main/include/log4cxx/helpers/bufferedwriter.h | 6 +-
src/main/include/log4cxx/helpers/cyclicbuffer.h | 6 +-
src/main/include/log4cxx/helpers/threadutility.h | 176 +++++++++++----------
src/main/include/log4cxx/htmllayout.h | 1 +
.../include/log4cxx/net/socketappenderskeleton.h | 4 +-
src/main/include/log4cxx/pattern/formattinginfo.h | 4 +-
.../log4cxx/pattern/literalpatternconverter.h | 2 +-
.../include/log4cxx/pattern/namepatternconverter.h | 2 +-
.../include/log4cxx/pattern/patternconverter.h | 2 +-
.../log4cxx/pattern/propertiespatternconverter.h | 2 +-
.../pattern/throwableinformationpatternconverter.h | 2 +-
src/main/include/log4cxx/private/action_priv.h | 19 ++-
.../log4cxx/private/appenderskeleton_priv.h | 70 ++++----
.../include/log4cxx/private/fileappender_priv.h | 56 +++----
src/main/include/log4cxx/private/filter_priv.h | 11 +-
.../include/log4cxx/private/odbcappender_priv.h | 99 ++++++------
.../log4cxx/private/patternconverter_priv.h | 25 +--
.../log4cxx/private/socketappenderskeleton_priv.h | 47 +++---
.../include/log4cxx/private/syslogappender_priv.h | 110 +++++++------
.../include/log4cxx/private/writerappender_priv.h | 26 +--
.../include/log4cxx/rolling/filerenameaction.h | 2 +-
.../include/log4cxx/rolling/rollingfileappender.h | 14 +-
.../include/log4cxx/rolling/zipcompressaction.h | 2 +-
src/main/include/log4cxx/spi/configurator.h | 2 +-
src/main/include/log4cxx/spi/filter.h | 2 +-
src/main/include/log4cxx/writerappender.h | 4 +-
src/main/include/log4cxx/xml/domconfigurator.h | 4 +-
src/test/cpp/customlogger/xlogger.cpp | 4 +
src/test/cpp/customlogger/xloggertestcase.cpp | 4 +-
src/test/cpp/encodingtest.cpp | 4 +-
src/test/cpp/helpers/casttestcase.cpp | 3 +-
src/test/cpp/helpers/threadutilitytestcase.cpp | 40 +++--
src/test/cpp/hierarchythresholdtestcase.cpp | 4 +-
src/test/cpp/l7dtestcase.cpp | 4 +-
src/test/cpp/mdctestcase.cpp | 4 +-
src/test/cpp/minimumtestcase.cpp | 4 +-
src/test/cpp/multithreadtest.cpp | 50 +++---
src/test/cpp/ndctestcase.cpp | 4 +-
src/test/cpp/net/telnetappendertestcase.cpp | 3 +-
src/test/cpp/patternlayouttest.cpp | 6 +-
src/test/cpp/varia/errorhandlertestcase.cpp | 4 +-
src/test/cpp/varia/levelmatchfiltertestcase.cpp | 4 +-
src/test/cpp/varia/levelrangefiltertestcase.cpp | 4 +-
src/test/cpp/xml/domtestcase.cpp | 4 +-
src/test/cpp/xml/xmllayouttestcase.cpp | 4 +-
106 files changed, 852 insertions(+), 623 deletions(-)
[logging-log4cxx] 02/02: Formatted code according to astyle
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch LOGCXX-510
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit e81a567086b9dafbfd71413555613c18dc755452
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Fri Nov 5 21:45:58 2021 -0400
Formatted code according to astyle
---
src/main/cpp/action.cpp | 2 +-
src/main/cpp/andfilter.cpp | 11 +-
src/main/cpp/appenderattachableimpl.cpp | 10 +-
src/main/cpp/appenderskeleton.cpp | 30 ++--
src/main/cpp/asyncappender.cpp | 7 +-
src/main/cpp/bufferedwriter.cpp | 3 +-
src/main/cpp/bytearrayinputstream.cpp | 5 +-
src/main/cpp/bytearrayoutputstream.cpp | 3 +-
src/main/cpp/bytebuffer.cpp | 5 +-
src/main/cpp/cacheddateformat.cpp | 5 +-
src/main/cpp/colorendpatternconverter.cpp | 2 +-
src/main/cpp/colorstartpatternconverter.cpp | 54 ++++---
src/main/cpp/consoleappender.cpp | 5 +-
src/main/cpp/cyclicbuffer.cpp | 5 +-
src/main/cpp/datagrampacket.cpp | 3 +-
src/main/cpp/datagramsocket.cpp | 3 +-
src/main/cpp/datepatternconverter.cpp | 11 +-
src/main/cpp/defaultrepositoryselector.cpp | 5 +-
src/main/cpp/domconfigurator.cpp | 24 ++-
src/main/cpp/fallbackerrorhandler.cpp | 5 +-
src/main/cpp/fileappender.cpp | 3 +-
src/main/cpp/fileinputstream.cpp | 5 +-
src/main/cpp/fileoutputstream.cpp | 5 +-
src/main/cpp/filerenameaction.cpp | 9 +-
src/main/cpp/filter.cpp | 5 +-
src/main/cpp/formattinginfo.cpp | 7 +-
src/main/cpp/gzcompressaction.cpp | 13 +-
src/main/cpp/hierarchy.cpp | 15 +-
src/main/cpp/htmllayout.cpp | 7 +-
src/main/cpp/levelmatchfilter.cpp | 5 +-
src/main/cpp/levelrangefilter.cpp | 7 +-
src/main/cpp/literalpatternconverter.cpp | 7 +-
src/main/cpp/locale.cpp | 5 +-
src/main/cpp/logger.cpp | 29 ++--
src/main/cpp/loggermatchfilter.cpp | 7 +-
src/main/cpp/loggingevent.cpp | 12 +-
src/main/cpp/loggingeventpatternconverter.cpp | 3 +-
src/main/cpp/mapfilter.cpp | 7 +-
src/main/cpp/namepatternconverter.cpp | 7 +-
src/main/cpp/odbcappender.cpp | 2 +-
src/main/cpp/patternconverter.cpp | 5 +-
src/main/cpp/patternlayout.cpp | 9 +-
src/main/cpp/propertiespatternconverter.cpp | 7 +-
src/main/cpp/propertyconfigurator.cpp | 16 +-
src/main/cpp/rollingfileappender.cpp | 5 +-
src/main/cpp/smtpappender.cpp | 10 +-
src/main/cpp/sockethubappender.cpp | 9 +-
src/main/cpp/socketoutputstream.cpp | 3 +-
src/main/cpp/stringmatchfilter.cpp | 9 +-
src/main/cpp/telnetappender.cpp | 13 +-
src/main/cpp/threadutility.cpp | 117 +++++++++-----
.../cpp/throwableinformationpatternconverter.cpp | 9 +-
src/main/cpp/writerappender.cpp | 6 +-
src/main/cpp/xmllayout.cpp | 7 +-
src/main/cpp/xmlsocketappender.cpp | 9 +-
src/main/cpp/zipcompressaction.cpp | 11 +-
src/main/include/log4cxx/appenderskeleton.h | 2 +-
src/main/include/log4cxx/asyncappender.h | 4 +-
src/main/include/log4cxx/consoleappender.h | 4 +-
src/main/include/log4cxx/db/odbcappender.h | 2 +-
src/main/include/log4cxx/fileappender.h | 6 +-
src/main/include/log4cxx/helpers/bufferedwriter.h | 6 +-
src/main/include/log4cxx/helpers/cyclicbuffer.h | 6 +-
src/main/include/log4cxx/helpers/threadutility.h | 176 +++++++++++----------
.../include/log4cxx/net/socketappenderskeleton.h | 4 +-
src/main/include/log4cxx/pattern/formattinginfo.h | 4 +-
.../log4cxx/pattern/literalpatternconverter.h | 2 +-
.../include/log4cxx/pattern/namepatternconverter.h | 2 +-
.../include/log4cxx/pattern/patternconverter.h | 2 +-
.../log4cxx/pattern/propertiespatternconverter.h | 2 +-
.../pattern/throwableinformationpatternconverter.h | 2 +-
src/main/include/log4cxx/private/action_priv.h | 19 ++-
.../log4cxx/private/appenderskeleton_priv.h | 70 ++++----
.../include/log4cxx/private/fileappender_priv.h | 56 +++----
src/main/include/log4cxx/private/filter_priv.h | 11 +-
.../include/log4cxx/private/odbcappender_priv.h | 99 ++++++------
.../log4cxx/private/patternconverter_priv.h | 25 +--
.../log4cxx/private/socketappenderskeleton_priv.h | 47 +++---
.../include/log4cxx/private/syslogappender_priv.h | 110 +++++++------
.../include/log4cxx/private/writerappender_priv.h | 26 +--
.../include/log4cxx/rolling/filerenameaction.h | 2 +-
.../include/log4cxx/rolling/rollingfileappender.h | 14 +-
.../include/log4cxx/rolling/zipcompressaction.h | 2 +-
src/main/include/log4cxx/spi/configurator.h | 2 +-
src/main/include/log4cxx/spi/filter.h | 2 +-
src/main/include/log4cxx/writerappender.h | 4 +-
src/main/include/log4cxx/xml/domconfigurator.h | 4 +-
src/test/cpp/customlogger/xlogger.cpp | 4 +
src/test/cpp/customlogger/xloggertestcase.cpp | 4 +-
src/test/cpp/encodingtest.cpp | 4 +-
src/test/cpp/helpers/casttestcase.cpp | 3 +-
src/test/cpp/helpers/threadutilitytestcase.cpp | 40 +++--
src/test/cpp/hierarchythresholdtestcase.cpp | 4 +-
src/test/cpp/l7dtestcase.cpp | 4 +-
src/test/cpp/mdctestcase.cpp | 4 +-
src/test/cpp/minimumtestcase.cpp | 4 +-
src/test/cpp/multithreadtest.cpp | 50 +++---
src/test/cpp/ndctestcase.cpp | 4 +-
src/test/cpp/net/telnetappendertestcase.cpp | 3 +-
src/test/cpp/patternlayouttest.cpp | 6 +-
src/test/cpp/varia/errorhandlertestcase.cpp | 4 +-
src/test/cpp/varia/levelmatchfiltertestcase.cpp | 4 +-
src/test/cpp/varia/levelrangefiltertestcase.cpp | 4 +-
src/test/cpp/xml/domtestcase.cpp | 4 +-
src/test/cpp/xml/xmllayouttestcase.cpp | 4 +-
105 files changed, 850 insertions(+), 624 deletions(-)
diff --git a/src/main/cpp/action.cpp b/src/main/cpp/action.cpp
index 43ff238..35b1f4b 100644
--- a/src/main/cpp/action.cpp
+++ b/src/main/cpp/action.cpp
@@ -31,7 +31,7 @@ Action::Action() :
}
Action::Action( std::unique_ptr<ActionPrivate> priv ) :
- m_priv( std::move(priv) ){}
+ m_priv( std::move(priv) ) {}
Action::~Action()
{
diff --git a/src/main/cpp/andfilter.cpp b/src/main/cpp/andfilter.cpp
index d029e4f..bc434f1 100644
--- a/src/main/cpp/andfilter.cpp
+++ b/src/main/cpp/andfilter.cpp
@@ -28,11 +28,12 @@ using namespace log4cxx::helpers;
#define priv static_cast<AndFilterPrivate*>(m_priv.get())
-struct AndFilter::AndFilterPrivate : public FilterPrivate{
+struct AndFilter::AndFilterPrivate : public FilterPrivate
+{
AndFilterPrivate() : FilterPrivate(),
- headFilter(),
- tailFilter(),
- acceptOnMatch(true){}
+ headFilter(),
+ tailFilter(),
+ acceptOnMatch(true) {}
log4cxx::spi::FilterPtr headFilter;
log4cxx::spi::FilterPtr tailFilter;
@@ -46,7 +47,7 @@ AndFilter::AndFilter()
{
}
-AndFilter::~AndFilter(){}
+AndFilter::~AndFilter() {}
void AndFilter::addFilter(const FilterPtr& filter)
{
diff --git a/src/main/cpp/appenderattachableimpl.cpp b/src/main/cpp/appenderattachableimpl.cpp
index 734d9a3..3de8ccf 100644
--- a/src/main/cpp/appenderattachableimpl.cpp
+++ b/src/main/cpp/appenderattachableimpl.cpp
@@ -28,7 +28,8 @@ using namespace log4cxx::spi;
IMPLEMENT_LOG4CXX_OBJECT(AppenderAttachableImpl)
-struct AppenderAttachableImpl::priv_data{
+struct AppenderAttachableImpl::priv_data
+{
/** Array of appenders. */
AppenderList appenderList;
mutable std::mutex m_mutex;
@@ -40,7 +41,8 @@ AppenderAttachableImpl::AppenderAttachableImpl(Pool& pool) :
{
}
-AppenderAttachableImpl::~AppenderAttachableImpl(){
+AppenderAttachableImpl::~AppenderAttachableImpl()
+{
}
@@ -78,6 +80,7 @@ int AppenderAttachableImpl::appendLoopOnAppenders(
std::unique_lock<std::mutex> lock( m_priv->m_mutex );
allAppenders = m_priv->appenderList;
}
+
for (AppenderList::iterator it = allAppenders.begin();
it != allAppenders.end();
it++)
@@ -187,7 +190,8 @@ void AppenderAttachableImpl::removeAppender(const LogString& name)
}
}
-std::mutex& AppenderAttachableImpl::getMutex(){
+std::mutex& AppenderAttachableImpl::getMutex()
+{
return m_priv->m_mutex;
}
diff --git a/src/main/cpp/appenderskeleton.cpp b/src/main/cpp/appenderskeleton.cpp
index d709cfe..b881d52 100644
--- a/src/main/cpp/appenderskeleton.cpp
+++ b/src/main/cpp/appenderskeleton.cpp
@@ -31,7 +31,7 @@ using namespace log4cxx::helpers;
IMPLEMENT_LOG4CXX_OBJECT(AppenderSkeleton)
AppenderSkeleton::AppenderSkeleton( std::unique_ptr<AppenderSkeletonPrivate> priv )
- : m_priv(std::move(priv))
+ : m_priv(std::move(priv))
{
}
@@ -43,12 +43,12 @@ AppenderSkeleton::AppenderSkeleton()
}
AppenderSkeleton::AppenderSkeleton(const LayoutPtr& layout1)
- : m_priv(std::make_unique<AppenderSkeletonPrivate>())
+ : m_priv(std::make_unique<AppenderSkeletonPrivate>())
{
}
-AppenderSkeleton::~AppenderSkeleton(){}
+AppenderSkeleton::~AppenderSkeleton() {}
void AppenderSkeleton::finalize()
{
@@ -163,34 +163,42 @@ void AppenderSkeleton::setOption(const LogString& option,
}
}
-const spi::ErrorHandlerPtr AppenderSkeleton::getErrorHandler() const{
+const spi::ErrorHandlerPtr AppenderSkeleton::getErrorHandler() const
+{
return m_priv->errorHandler;
}
-spi::FilterPtr AppenderSkeleton::getFilter() const{
+spi::FilterPtr AppenderSkeleton::getFilter() const
+{
return m_priv->headFilter;
}
-const spi::FilterPtr AppenderSkeleton::getFirstFilter() const{
+const spi::FilterPtr AppenderSkeleton::getFirstFilter() const
+{
return m_priv->headFilter;
}
-LayoutPtr AppenderSkeleton::getLayout() const{
+LayoutPtr AppenderSkeleton::getLayout() const
+{
return m_priv->layout;
}
-LogString AppenderSkeleton::getName() const{
+LogString AppenderSkeleton::getName() const
+{
return m_priv->name;
}
-const LevelPtr AppenderSkeleton::getThreshold() const{
+const LevelPtr AppenderSkeleton::getThreshold() const
+{
return m_priv->threshold;
}
-void AppenderSkeleton::setLayout(const LayoutPtr layout1){
+void AppenderSkeleton::setLayout(const LayoutPtr layout1)
+{
m_priv->layout = layout1;
}
-void AppenderSkeleton::setName(const LogString& name1){
+void AppenderSkeleton::setName(const LogString& name1)
+{
m_priv->name.assign(name1);
}
diff --git a/src/main/cpp/asyncappender.cpp b/src/main/cpp/asyncappender.cpp
index 71b29a1..2b97487 100644
--- a/src/main/cpp/asyncappender.cpp
+++ b/src/main/cpp/asyncappender.cpp
@@ -88,15 +88,16 @@ class DiscardSummary
typedef std::map<LogString, DiscardSummary> DiscardMap;
-struct AsyncAppender::AsyncAppenderPriv : public AppenderSkeleton::AppenderSkeletonPrivate {
- AsyncAppenderPriv() :
+struct AsyncAppender::AsyncAppenderPriv : public AppenderSkeleton::AppenderSkeletonPrivate
+{
+ AsyncAppenderPriv() :
AppenderSkeletonPrivate(),
buffer(),
bufferSize(DEFAULT_BUFFER_SIZE),
appenders(std::make_shared<AppenderAttachableImpl>(pool)),
dispatcher(),
locationInfo(false),
- blocking(true){}
+ blocking(true) {}
/**
* Event buffer.
diff --git a/src/main/cpp/bufferedwriter.cpp b/src/main/cpp/bufferedwriter.cpp
index 2175959..ad77e9d 100644
--- a/src/main/cpp/bufferedwriter.cpp
+++ b/src/main/cpp/bufferedwriter.cpp
@@ -21,7 +21,8 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-struct BufferedWriter::BufferedWriterPriv {
+struct BufferedWriter::BufferedWriterPriv
+{
BufferedWriterPriv(WriterPtr& out1, size_t sz1) :
out(out1),
sz(sz1)
diff --git a/src/main/cpp/bytearrayinputstream.cpp b/src/main/cpp/bytearrayinputstream.cpp
index cb2453e..ff51d55 100644
--- a/src/main/cpp/bytearrayinputstream.cpp
+++ b/src/main/cpp/bytearrayinputstream.cpp
@@ -26,10 +26,11 @@ using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace std;
-struct ByteArrayInputStream::ByteArrayInputStreamPriv{
+struct ByteArrayInputStream::ByteArrayInputStreamPriv
+{
ByteArrayInputStreamPriv(const ByteList& bytes) :
buf(bytes),
- pos(0){}
+ pos(0) {}
ByteList buf;
size_t pos;
diff --git a/src/main/cpp/bytearrayoutputstream.cpp b/src/main/cpp/bytearrayoutputstream.cpp
index 786581c..a6e171f 100644
--- a/src/main/cpp/bytearrayoutputstream.cpp
+++ b/src/main/cpp/bytearrayoutputstream.cpp
@@ -24,7 +24,8 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-struct ByteArrayOutputStream::ByteArrayOutputStreamPriv{
+struct ByteArrayOutputStream::ByteArrayOutputStreamPriv
+{
ByteList array;
};
diff --git a/src/main/cpp/bytebuffer.cpp b/src/main/cpp/bytebuffer.cpp
index 1347afb..84d09d8 100644
--- a/src/main/cpp/bytebuffer.cpp
+++ b/src/main/cpp/bytebuffer.cpp
@@ -22,9 +22,10 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-struct ByteBuffer::ByteBufferPriv{
+struct ByteBuffer::ByteBufferPriv
+{
ByteBufferPriv(char* data1, size_t capacity) :
- base(data1), pos(0), lim(capacity), cap(capacity){}
+ base(data1), pos(0), lim(capacity), cap(capacity) {}
char* base;
size_t pos;
diff --git a/src/main/cpp/cacheddateformat.cpp b/src/main/cpp/cacheddateformat.cpp
index 9b8df53..b51aeff 100644
--- a/src/main/cpp/cacheddateformat.cpp
+++ b/src/main/cpp/cacheddateformat.cpp
@@ -29,7 +29,8 @@ using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::pattern;
-struct CachedDateFormat::CachedDateFormatPriv{
+struct CachedDateFormat::CachedDateFormatPriv
+{
CachedDateFormatPriv(DateFormatPtr dateFormat, int expiration1) :
formatter(dateFormat),
millisecondStart(0),
@@ -139,7 +140,7 @@ CachedDateFormat::CachedDateFormat(const DateFormatPtr& dateFormat,
}
}
-CachedDateFormat::~CachedDateFormat(){}
+CachedDateFormat::~CachedDateFormat() {}
/**
diff --git a/src/main/cpp/colorendpatternconverter.cpp b/src/main/cpp/colorendpatternconverter.cpp
index 69a9fda..46e1850 100644
--- a/src/main/cpp/colorendpatternconverter.cpp
+++ b/src/main/cpp/colorendpatternconverter.cpp
@@ -50,6 +50,6 @@ void ColorEndPatternConverter::format(
Pool& p) const
{
- toAppendTo.append(LOG4CXX_STR("\x1B[39m"));
+ toAppendTo.append(LOG4CXX_STR("\x1B[39m"));
}
diff --git a/src/main/cpp/colorstartpatternconverter.cpp b/src/main/cpp/colorstartpatternconverter.cpp
index 466bada..2130964 100644
--- a/src/main/cpp/colorstartpatternconverter.cpp
+++ b/src/main/cpp/colorstartpatternconverter.cpp
@@ -50,27 +50,35 @@ void ColorStartPatternConverter::format(
Pool& p) const
{
- log4cxx::LevelPtr lvl = event->getLevel();
- switch (lvl->toInt()){
- case log4cxx::Level::FATAL_INT:
- toAppendTo.append(LOG4CXX_STR("\x1B[35m")); //magenta
- break;
- case log4cxx::Level::ERROR_INT:
- toAppendTo.append(LOG4CXX_STR("\x1B[91m")); //red
- break;
- case log4cxx::Level::WARN_INT:
- toAppendTo.append(LOG4CXX_STR("\x1B[33m")); //yellow
- break;
- case log4cxx::Level::INFO_INT:
- toAppendTo.append(LOG4CXX_STR("\x1B[32m")); //green
- break;
- case log4cxx::Level::DEBUG_INT:
- toAppendTo.append(LOG4CXX_STR("\x1B[36m")); //cyan
- break;
- case log4cxx::Level::TRACE_INT:
- toAppendTo.append(LOG4CXX_STR("\x1B[34m")); //blue
- break;
- default:
- break;
- }
+ log4cxx::LevelPtr lvl = event->getLevel();
+
+ switch (lvl->toInt())
+ {
+ case log4cxx::Level::FATAL_INT:
+ toAppendTo.append(LOG4CXX_STR("\x1B[35m")); //magenta
+ break;
+
+ case log4cxx::Level::ERROR_INT:
+ toAppendTo.append(LOG4CXX_STR("\x1B[91m")); //red
+ break;
+
+ case log4cxx::Level::WARN_INT:
+ toAppendTo.append(LOG4CXX_STR("\x1B[33m")); //yellow
+ break;
+
+ case log4cxx::Level::INFO_INT:
+ toAppendTo.append(LOG4CXX_STR("\x1B[32m")); //green
+ break;
+
+ case log4cxx::Level::DEBUG_INT:
+ toAppendTo.append(LOG4CXX_STR("\x1B[36m")); //cyan
+ break;
+
+ case log4cxx::Level::TRACE_INT:
+ toAppendTo.append(LOG4CXX_STR("\x1B[34m")); //blue
+ break;
+
+ default:
+ break;
+ }
}
diff --git a/src/main/cpp/consoleappender.cpp b/src/main/cpp/consoleappender.cpp
index 026627d..c324297 100644
--- a/src/main/cpp/consoleappender.cpp
+++ b/src/main/cpp/consoleappender.cpp
@@ -27,10 +27,11 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-struct ConsoleAppender::ConsoleAppenderPriv : public WriterAppender::WriterAppenderPriv{
+struct ConsoleAppender::ConsoleAppenderPriv : public WriterAppender::WriterAppenderPriv
+{
ConsoleAppenderPriv(LogString target) :
WriterAppenderPriv(),
- target(target){}
+ target(target) {}
LogString target;
};
diff --git a/src/main/cpp/cyclicbuffer.cpp b/src/main/cpp/cyclicbuffer.cpp
index fe1d012..1aabd1d 100644
--- a/src/main/cpp/cyclicbuffer.cpp
+++ b/src/main/cpp/cyclicbuffer.cpp
@@ -25,9 +25,10 @@ using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-struct CyclicBuffer::CyclicBufferPriv{
+struct CyclicBuffer::CyclicBufferPriv
+{
CyclicBufferPriv(int maxSize1) :
- ea(maxSize1), first(0), last(0), numElems(0), maxSize(maxSize1){}
+ ea(maxSize1), first(0), last(0), numElems(0), maxSize(maxSize1) {}
log4cxx::spi::LoggingEventList ea;
int first;
diff --git a/src/main/cpp/datagrampacket.cpp b/src/main/cpp/datagrampacket.cpp
index 73b9f28..6db63ff 100644
--- a/src/main/cpp/datagrampacket.cpp
+++ b/src/main/cpp/datagrampacket.cpp
@@ -20,7 +20,8 @@
using namespace log4cxx::helpers;
-struct DatagramPacket::DatagramPacketPriv{
+struct DatagramPacket::DatagramPacketPriv
+{
DatagramPacketPriv(void* buf1, int length1)
: buf(buf1), offset(0), length(length1), address(), port(0)
{
diff --git a/src/main/cpp/datagramsocket.cpp b/src/main/cpp/datagramsocket.cpp
index b5ee30f..0aa46ff 100644
--- a/src/main/cpp/datagramsocket.cpp
+++ b/src/main/cpp/datagramsocket.cpp
@@ -25,7 +25,8 @@
using namespace log4cxx::helpers;
-struct DatagramSocket::DatagramSocketPriv{
+struct DatagramSocket::DatagramSocketPriv
+{
DatagramSocketPriv()
: socket(0), address(), localAddress(), port(0), localPort(0)
{
diff --git a/src/main/cpp/datepatternconverter.cpp b/src/main/cpp/datepatternconverter.cpp
index 282db76..f10cfec 100644
--- a/src/main/cpp/datepatternconverter.cpp
+++ b/src/main/cpp/datepatternconverter.cpp
@@ -38,10 +38,11 @@ using namespace log4cxx::pattern;
using namespace log4cxx::spi;
using namespace log4cxx::helpers;
-struct DatePatternConverter::DatePatternConverterPrivate : public PatternConverterPrivate{
+struct DatePatternConverter::DatePatternConverterPrivate : public PatternConverterPrivate
+{
DatePatternConverterPrivate( const LogString& name, const LogString& style, DateFormatPtr _df ):
- PatternConverterPrivate(name,style),
- df(_df){}
+ PatternConverterPrivate(name, style),
+ df(_df) {}
/**
* Date format.
*/
@@ -55,11 +56,11 @@ IMPLEMENT_LOG4CXX_OBJECT(DatePatternConverter)
DatePatternConverter::DatePatternConverter(
const std::vector<LogString>& options) :
LoggingEventPatternConverter (std::make_unique<DatePatternConverterPrivate>(LOG4CXX_STR("Class Name"),
- LOG4CXX_STR("class name"), getDateFormat(options)))
+ LOG4CXX_STR("class name"), getDateFormat(options)))
{
}
-DatePatternConverter::~DatePatternConverter(){}
+DatePatternConverter::~DatePatternConverter() {}
DateFormatPtr DatePatternConverter::getDateFormat(const OptionsList& options)
{
diff --git a/src/main/cpp/defaultrepositoryselector.cpp b/src/main/cpp/defaultrepositoryselector.cpp
index 2dc9a21..421c98a 100644
--- a/src/main/cpp/defaultrepositoryselector.cpp
+++ b/src/main/cpp/defaultrepositoryselector.cpp
@@ -21,7 +21,8 @@ using namespace log4cxx;
using namespace log4cxx::spi;
using namespace log4cxx::helpers;
-struct DefaultRepositorySelector::DefaultRepositorySelectorPrivate{
+struct DefaultRepositorySelector::DefaultRepositorySelectorPrivate
+{
LoggerRepositoryPtr repository;
};
@@ -31,7 +32,7 @@ DefaultRepositorySelector::DefaultRepositorySelector(const LoggerRepositoryPtr r
m_priv->repository = repository1;
}
-DefaultRepositorySelector::~DefaultRepositorySelector(){}
+DefaultRepositorySelector::~DefaultRepositorySelector() {}
LoggerRepositoryPtr DefaultRepositorySelector::getLoggerRepository()
{
diff --git a/src/main/cpp/domconfigurator.cpp b/src/main/cpp/domconfigurator.cpp
index 37979ab..46b747f 100644
--- a/src/main/cpp/domconfigurator.cpp
+++ b/src/main/cpp/domconfigurator.cpp
@@ -56,7 +56,8 @@ using namespace log4cxx::spi;
using namespace log4cxx::config;
using namespace log4cxx::rolling;
-struct DOMConfigurator::DOMConfiguratorPrivate{
+struct DOMConfigurator::DOMConfiguratorPrivate
+{
helpers::Properties props;
spi::LoggerRepositoryPtr repository;
spi::LoggerFactoryPtr loggerFactory;
@@ -127,7 +128,7 @@ DOMConfigurator::DOMConfigurator()
{
}
-DOMConfigurator::~DOMConfigurator(){}
+DOMConfigurator::~DOMConfigurator() {}
/**
Used internally to parse appenders by IDREF name.
@@ -1046,14 +1047,23 @@ void DOMConfigurator::parse(
}
LogString threadSignalValue = subst(getAttribute(utf8Decoder, element, THREAD_CONFIG_ATTR));
- if( !threadSignalValue.empty() && threadSignalValue != NULL_STRING ){
- if( threadSignalValue == LOG4CXX_STR("NoConfiguration") ){
+
+ if ( !threadSignalValue.empty() && threadSignalValue != NULL_STRING )
+ {
+ if ( threadSignalValue == LOG4CXX_STR("NoConfiguration") )
+ {
helpers::ThreadUtility::configure( ThreadConfigurationType::NoConfiguration );
- }else if( threadSignalValue == LOG4CXX_STR("BlockSignalsOnly") ){
+ }
+ else if ( threadSignalValue == LOG4CXX_STR("BlockSignalsOnly") )
+ {
helpers::ThreadUtility::configure( ThreadConfigurationType::BlockSignalsOnly );
- }else if( threadSignalValue == LOG4CXX_STR("NameThreadOnly") ){
+ }
+ else if ( threadSignalValue == LOG4CXX_STR("NameThreadOnly") )
+ {
helpers::ThreadUtility::configure( ThreadConfigurationType::NameThreadOnly );
- }else if( threadSignalValue == LOG4CXX_STR("BlockSignalsAndNameThread") ){
+ }
+ else if ( threadSignalValue == LOG4CXX_STR("BlockSignalsAndNameThread") )
+ {
helpers::ThreadUtility::configure( ThreadConfigurationType::BlockSignalsAndNameThread );
}
}
diff --git a/src/main/cpp/fallbackerrorhandler.cpp b/src/main/cpp/fallbackerrorhandler.cpp
index 57f55f2..91b6ddd 100644
--- a/src/main/cpp/fallbackerrorhandler.cpp
+++ b/src/main/cpp/fallbackerrorhandler.cpp
@@ -30,7 +30,8 @@ using namespace log4cxx::varia;
IMPLEMENT_LOG4CXX_OBJECT(FallbackErrorHandler)
-struct FallbackErrorHandler::FallbackErrorHandlerPrivate {
+struct FallbackErrorHandler::FallbackErrorHandlerPrivate
+{
AppenderWeakPtr backup;
AppenderWeakPtr primary;
std::vector<LoggerPtr> loggers;
@@ -41,7 +42,7 @@ FallbackErrorHandler::FallbackErrorHandler()
{
}
-FallbackErrorHandler::~FallbackErrorHandler(){}
+FallbackErrorHandler::~FallbackErrorHandler() {}
void FallbackErrorHandler::setLogger(const LoggerPtr& logger)
{
diff --git a/src/main/cpp/fileappender.cpp b/src/main/cpp/fileappender.cpp
index e4a7b48..774b19e 100644
--- a/src/main/cpp/fileappender.cpp
+++ b/src/main/cpp/fileappender.cpp
@@ -81,7 +81,8 @@ FileAppender::FileAppender(const LayoutPtr& layout1, const LogString& fileName1)
}
FileAppender::FileAppender(std::unique_ptr<FileAppenderPriv> priv) :
- WriterAppender (std::move(priv)){
+ WriterAppender (std::move(priv))
+{
_priv->fileAppend = true;
_priv->bufferedIO = false;
_priv->bufferSize = 8 * 1024;
diff --git a/src/main/cpp/fileinputstream.cpp b/src/main/cpp/fileinputstream.cpp
index af5aec8..99a7b3b 100644
--- a/src/main/cpp/fileinputstream.cpp
+++ b/src/main/cpp/fileinputstream.cpp
@@ -29,8 +29,9 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-struct FileInputStream::FileInputStreamPrivate {
- FileInputStreamPrivate() : fileptr(nullptr){}
+struct FileInputStream::FileInputStreamPrivate
+{
+ FileInputStreamPrivate() : fileptr(nullptr) {}
Pool pool;
apr_file_t* fileptr;
diff --git a/src/main/cpp/fileoutputstream.cpp b/src/main/cpp/fileoutputstream.cpp
index 526d3d3..a55e6ad 100644
--- a/src/main/cpp/fileoutputstream.cpp
+++ b/src/main/cpp/fileoutputstream.cpp
@@ -29,8 +29,9 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-struct FileOutputStream::FileOutputStreamPrivate{
- FileOutputStreamPrivate() : fileptr(nullptr){}
+struct FileOutputStream::FileOutputStreamPrivate
+{
+ FileOutputStreamPrivate() : fileptr(nullptr) {}
Pool pool;
apr_file_t* fileptr;
diff --git a/src/main/cpp/filerenameaction.cpp b/src/main/cpp/filerenameaction.cpp
index b30bcc5..9343aa8 100644
--- a/src/main/cpp/filerenameaction.cpp
+++ b/src/main/cpp/filerenameaction.cpp
@@ -25,11 +25,12 @@ using namespace log4cxx::helpers;
#define priv static_cast<FileRenameActionPrivate*>(m_priv.get())
-struct FileRenameAction::FileRenameActionPrivate : public ActionPrivate{
+struct FileRenameAction::FileRenameActionPrivate : public ActionPrivate
+{
FileRenameActionPrivate( const File& toRename,
- const File& renameTo,
- bool renameEmptyFile1):
- source(toRename), destination(renameTo), renameEmptyFile(renameEmptyFile1){}
+ const File& renameTo,
+ bool renameEmptyFile1):
+ source(toRename), destination(renameTo), renameEmptyFile(renameEmptyFile1) {}
const File source;
const File destination;
diff --git a/src/main/cpp/filter.cpp b/src/main/cpp/filter.cpp
index 3c47cca..2574fa4 100644
--- a/src/main/cpp/filter.cpp
+++ b/src/main/cpp/filter.cpp
@@ -28,11 +28,12 @@ Filter::Filter() : m_priv(std::make_unique<FilterPrivate>())
}
Filter::Filter(std::unique_ptr<FilterPrivate> priv) :
- m_priv(std::move(priv)){
+ m_priv(std::move(priv))
+{
}
-Filter::~Filter(){}
+Filter::~Filter() {}
FilterPtr Filter::getNext() const
{
diff --git a/src/main/cpp/formattinginfo.cpp b/src/main/cpp/formattinginfo.cpp
index ce15f5a..c0f0260 100644
--- a/src/main/cpp/formattinginfo.cpp
+++ b/src/main/cpp/formattinginfo.cpp
@@ -22,11 +22,12 @@
using namespace log4cxx;
using namespace log4cxx::pattern;
-struct FormattingInfo::FormattingInfoPrivate{
+struct FormattingInfo::FormattingInfoPrivate
+{
FormattingInfoPrivate(const bool leftAlign1, const int minLength1, const int maxLength1):
minLength(minLength1),
maxLength(maxLength1),
- leftAlign(leftAlign1){}
+ leftAlign(leftAlign1) {}
/**
* Minimum length.
@@ -58,7 +59,7 @@ FormattingInfo::FormattingInfo(
{
}
-FormattingInfo::~FormattingInfo(){}
+FormattingInfo::~FormattingInfo() {}
/**
* Gets default instance.
diff --git a/src/main/cpp/gzcompressaction.cpp b/src/main/cpp/gzcompressaction.cpp
index d7af63f..f01d2a7 100644
--- a/src/main/cpp/gzcompressaction.cpp
+++ b/src/main/cpp/gzcompressaction.cpp
@@ -28,11 +28,12 @@ using namespace log4cxx::helpers;
#define priv static_cast<GZCompressActionPrivate*>(m_priv.get())
-struct GZCompressAction::GZCompressActionPrivate : public ActionPrivate{
+struct GZCompressAction::GZCompressActionPrivate : public ActionPrivate
+{
GZCompressActionPrivate( const File& toRename,
- const File& renameTo,
- bool deleteSource):
- source(toRename), destination(renameTo), deleteSource(deleteSource){}
+ const File& renameTo,
+ bool deleteSource):
+ source(toRename), destination(renameTo), deleteSource(deleteSource) {}
const File source;
const File destination;
@@ -45,11 +46,11 @@ GZCompressAction::GZCompressAction(const File& src,
const File& dest,
bool del)
: Action(std::make_unique<GZCompressActionPrivate>(
- src, dest, del))
+ src, dest, del))
{
}
-GZCompressAction::~GZCompressAction(){}
+GZCompressAction::~GZCompressAction() {}
bool GZCompressAction::execute(log4cxx::helpers::Pool& p) const
{
diff --git a/src/main/cpp/hierarchy.cpp b/src/main/cpp/hierarchy.cpp
index 4be5f49..807f94e 100644
--- a/src/main/cpp/hierarchy.cpp
+++ b/src/main/cpp/hierarchy.cpp
@@ -49,8 +49,10 @@ using namespace log4cxx::helpers;
typedef std::map<LogString, LoggerPtr> LoggerMap;
typedef std::map<LogString, ProvisionNode> ProvisionNodeMap;
-struct Hierarchy::HierarchyPrivate {
- HierarchyPrivate(){
+struct Hierarchy::HierarchyPrivate
+{
+ HierarchyPrivate()
+ {
loggers = std::make_unique<LoggerMap>();
provisionNodes = std::make_unique<ProvisionNodeMap>();
root = std::make_shared<RootLogger>(pool, Level::getDebug());
@@ -439,17 +441,20 @@ bool Hierarchy::isConfigured()
return m_priv->configured;
}
-HierarchyPtr Hierarchy::create(){
+HierarchyPtr Hierarchy::create()
+{
HierarchyPtr ret( new Hierarchy() );
ret->configureRoot();
return ret;
}
-void Hierarchy::configureRoot(){
+void Hierarchy::configureRoot()
+{
// This should really be done in the constructor, but in order to fix
// LOGCXX-322 we need to turn the repositroy into a weak_ptr, and we
// can't use weak_from_this() in the constructor.
- if( !m_priv->root->getLoggerRepository().lock() ){
+ if ( !m_priv->root->getLoggerRepository().lock() )
+ {
m_priv->root->setHierarchy(shared_from_this());
}
}
diff --git a/src/main/cpp/htmllayout.cpp b/src/main/cpp/htmllayout.cpp
index 60930fa..5844667 100644
--- a/src/main/cpp/htmllayout.cpp
+++ b/src/main/cpp/htmllayout.cpp
@@ -33,9 +33,10 @@ using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-struct HTMLLayout::HTMLLayoutPrivate {
+struct HTMLLayout::HTMLLayoutPrivate
+{
HTMLLayoutPrivate() : locationInfo(false), title(LOG4CXX_STR("Log4cxx Log Messages")),
- dateFormat(){}
+ dateFormat() {}
// Print no location info by default
bool locationInfo; //= false
@@ -54,7 +55,7 @@ HTMLLayout::HTMLLayout()
m_priv->dateFormat.setTimeZone(TimeZone::getGMT());
}
-HTMLLayout::~HTMLLayout(){}
+HTMLLayout::~HTMLLayout() {}
void HTMLLayout::setOption(const LogString& option,
diff --git a/src/main/cpp/levelmatchfilter.cpp b/src/main/cpp/levelmatchfilter.cpp
index 22877f6..7e67db2 100644
--- a/src/main/cpp/levelmatchfilter.cpp
+++ b/src/main/cpp/levelmatchfilter.cpp
@@ -30,7 +30,8 @@ using namespace log4cxx::helpers;
#define priv static_cast<LevelMatchFilterPrivate*>(m_priv.get())
-struct LevelMatchFilter::LevelMatchFilterPrivate : public FilterPrivate {
+struct LevelMatchFilter::LevelMatchFilterPrivate : public FilterPrivate
+{
bool acceptOnMatch;
LevelPtr levelToMatch;
};
@@ -43,7 +44,7 @@ LevelMatchFilter::LevelMatchFilter()
priv->acceptOnMatch = true;
}
-LevelMatchFilter::~LevelMatchFilter(){}
+LevelMatchFilter::~LevelMatchFilter() {}
void LevelMatchFilter::setOption(const LogString& option,
const LogString& value)
diff --git a/src/main/cpp/levelrangefilter.cpp b/src/main/cpp/levelrangefilter.cpp
index 8d79ae1..dcdf6c9 100644
--- a/src/main/cpp/levelrangefilter.cpp
+++ b/src/main/cpp/levelrangefilter.cpp
@@ -30,8 +30,9 @@ using namespace log4cxx::helpers;
#define priv static_cast<LevelRangeFilterPrivate*>(m_priv.get())
-struct LevelRangeFilter::LevelRangeFilterPrivate : public FilterPrivate{
- LevelRangeFilterPrivate() : acceptOnMatch(false), levelMin(Level::getAll()), levelMax(Level::getOff()){}
+struct LevelRangeFilter::LevelRangeFilterPrivate : public FilterPrivate
+{
+ LevelRangeFilterPrivate() : acceptOnMatch(false), levelMin(Level::getAll()), levelMax(Level::getOff()) {}
/**
Do we return ACCEPT when a match occurs. Default is
@@ -50,7 +51,7 @@ LevelRangeFilter::LevelRangeFilter()
{
}
-LevelRangeFilter::~LevelRangeFilter(){}
+LevelRangeFilter::~LevelRangeFilter() {}
void LevelRangeFilter::setOption(const LogString& option,
const LogString& value)
diff --git a/src/main/cpp/literalpatternconverter.cpp b/src/main/cpp/literalpatternconverter.cpp
index afb7ff5..b9851fc 100644
--- a/src/main/cpp/literalpatternconverter.cpp
+++ b/src/main/cpp/literalpatternconverter.cpp
@@ -31,10 +31,11 @@ using namespace log4cxx::helpers;
#define priv static_cast<LiteralPatternConverterPrivate*>(m_priv.get())
-struct LiteralPatternConverter::LiteralPatternConverterPrivate : public PatternConverterPrivate {
+struct LiteralPatternConverter::LiteralPatternConverterPrivate : public PatternConverterPrivate
+{
LiteralPatternConverterPrivate( const LogString& name, const LogString& style, const LogString& literal1 ) :
PatternConverterPrivate( name, style ),
- literal(literal1){}
+ literal(literal1) {}
/**
* String literal.
@@ -46,7 +47,7 @@ IMPLEMENT_LOG4CXX_OBJECT(LiteralPatternConverter)
LiteralPatternConverter::LiteralPatternConverter(const LogString& literal1) :
LoggingEventPatternConverter(std::make_unique<LiteralPatternConverterPrivate>
- (LOG4CXX_STR("Literal"), LOG4CXX_STR("literal"),literal1))
+ (LOG4CXX_STR("Literal"), LOG4CXX_STR("literal"), literal1))
{
}
diff --git a/src/main/cpp/locale.cpp b/src/main/cpp/locale.cpp
index 6e1393f..4997cc9 100644
--- a/src/main/cpp/locale.cpp
+++ b/src/main/cpp/locale.cpp
@@ -20,7 +20,8 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-struct Locale::LocalePrivate {
+struct Locale::LocalePrivate
+{
LocalePrivate(const LogString& language1)
: language(language1)
{
@@ -58,7 +59,7 @@ Locale::Locale(const LogString& language1, const LogString& country1,
{
}
-Locale::~Locale(){}
+Locale::~Locale() {}
const LogString& Locale::getLanguage() const
{
diff --git a/src/main/cpp/logger.cpp b/src/main/cpp/logger.cpp
index 7120a67..026960a 100644
--- a/src/main/cpp/logger.cpp
+++ b/src/main/cpp/logger.cpp
@@ -39,7 +39,8 @@ using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-struct Logger::LoggerPrivate{
+struct Logger::LoggerPrivate
+{
LoggerPrivate(Pool& p, const LogString& name1):
pool(&p),
name(name1),
@@ -48,7 +49,7 @@ struct Logger::LoggerPrivate{
resourceBundle(),
repository(),
aai(new AppenderAttachableImpl(*pool)),
- additive(true){}
+ additive(true) {}
/**
* Reference to memory pool.
@@ -84,12 +85,12 @@ struct Logger::LoggerPrivate{
helpers::AppenderAttachableImplPtr aai;
/** Additivity is set to true by default, that is children inherit
- the appenders of their ancestors by default. If this variable is
- set to <code>false</code> then the appenders found in the
- ancestors of this logger are not used. However, the children
- of this logger will inherit its appenders, unless the children
- have their additivity flag set to <code>false</code> too. See
- the user manual for more details. */
+ the appenders of their ancestors by default. If this variable is
+ set to <code>false</code> then the appenders found in the
+ ancestors of this logger are not used. However, the children
+ of this logger will inherit its appenders, unless the children
+ have their additivity flag set to <code>false</code> too. See
+ the user manual for more details. */
bool additive;
mutable shared_mutex mutex;
@@ -157,6 +158,7 @@ void Logger::callAppenders(const spi::LoggingEventPtr& event, Pool& p) const
}
log4cxx::spi::LoggerRepositoryPtr rep = m_priv->repository.lock();
+
if (writes == 0 && rep)
{
rep->emitNoAppenderWarning(const_cast<Logger*>(this));
@@ -298,6 +300,7 @@ bool Logger::isAttached(const AppenderPtr appender) const
bool Logger::isTraceEnabled() const
{
log4cxx::spi::LoggerRepositoryPtr rep = m_priv->repository.lock();
+
if (!rep || rep->isDisabled(Level::TRACE_INT))
{
return false;
@@ -309,6 +312,7 @@ bool Logger::isTraceEnabled() const
bool Logger::isDebugEnabled() const
{
log4cxx::spi::LoggerRepositoryPtr rep = m_priv->repository.lock();
+
if (!rep || rep->isDisabled(Level::DEBUG_INT))
{
return false;
@@ -320,6 +324,7 @@ bool Logger::isDebugEnabled() const
bool Logger::isEnabledFor(const LevelPtr& level1) const
{
log4cxx::spi::LoggerRepositoryPtr rep = m_priv->repository.lock();
+
if (!rep || rep->isDisabled(level1->toInt()))
{
return false;
@@ -332,6 +337,7 @@ bool Logger::isEnabledFor(const LevelPtr& level1) const
bool Logger::isInfoEnabled() const
{
log4cxx::spi::LoggerRepositoryPtr rep = m_priv->repository.lock();
+
if (!rep || rep->isDisabled(Level::INFO_INT))
{
return false;
@@ -343,6 +349,7 @@ bool Logger::isInfoEnabled() const
bool Logger::isErrorEnabled() const
{
log4cxx::spi::LoggerRepositoryPtr rep = m_priv->repository.lock();
+
if (!rep || rep->isDisabled(Level::ERROR_INT))
{
return false;
@@ -354,6 +361,7 @@ bool Logger::isErrorEnabled() const
bool Logger::isWarnEnabled() const
{
log4cxx::spi::LoggerRepositoryPtr rep = m_priv->repository.lock();
+
if (!rep || rep->isDisabled(Level::WARN_INT))
{
return false;
@@ -365,6 +373,7 @@ bool Logger::isWarnEnabled() const
bool Logger::isFatalEnabled() const
{
log4cxx::spi::LoggerRepositoryPtr rep = m_priv->repository.lock();
+
if (!rep || rep->isDisabled(Level::FATAL_INT))
{
return false;
@@ -402,6 +411,7 @@ void Logger::l7dlog(const LevelPtr& level1, const LogString& key,
const LocationInfo& location, const std::vector<LogString>& params) const
{
log4cxx::spi::LoggerRepositoryPtr rep = m_priv->repository.lock();
+
if (!rep || rep->isDisabled(level1->toInt()))
{
return;
@@ -502,7 +512,8 @@ void Logger::setHierarchy(spi::LoggerRepositoryWeakPtr repository1)
m_priv->repository = repository1;
}
-void Logger::setParent(LoggerPtr parentLogger){
+void Logger::setParent(LoggerPtr parentLogger)
+{
m_priv->parent = parentLogger;
}
diff --git a/src/main/cpp/loggermatchfilter.cpp b/src/main/cpp/loggermatchfilter.cpp
index 9a1e2c3..c1dcc5c 100644
--- a/src/main/cpp/loggermatchfilter.cpp
+++ b/src/main/cpp/loggermatchfilter.cpp
@@ -29,10 +29,11 @@ using namespace log4cxx::helpers;
#define priv static_cast<LoggerMatchFilterPrivate*>(m_priv.get())
-struct LoggerMatchFilter::LoggerMatchFilterPrivate : public FilterPrivate {
+struct LoggerMatchFilter::LoggerMatchFilterPrivate : public FilterPrivate
+{
LoggerMatchFilterPrivate() : FilterPrivate(),
acceptOnMatch(true),
- loggerToMatch(LOG4CXX_STR("root")){}
+ loggerToMatch(LOG4CXX_STR("root")) {}
bool acceptOnMatch;
LogString loggerToMatch;
@@ -46,7 +47,7 @@ LoggerMatchFilter::LoggerMatchFilter()
{
}
-LoggerMatchFilter::~LoggerMatchFilter(){}
+LoggerMatchFilter::~LoggerMatchFilter() {}
void LoggerMatchFilter::setLoggerToMatch(const LogString& value)
{
diff --git a/src/main/cpp/loggingevent.cpp b/src/main/cpp/loggingevent.cpp
index bcec1b1..41827e1 100644
--- a/src/main/cpp/loggingevent.cpp
+++ b/src/main/cpp/loggingevent.cpp
@@ -42,7 +42,8 @@ using namespace log4cxx;
using namespace log4cxx::spi;
using namespace log4cxx::helpers;
-struct LoggingEvent::LoggingEventPrivate{
+struct LoggingEvent::LoggingEventPrivate
+{
LoggingEventPrivate() :
ndc(0),
mdcCopy(0),
@@ -67,9 +68,10 @@ struct LoggingEvent::LoggingEventPrivate{
message(message1),
timeStamp(apr_time_now()),
locationInfo(locationInfo1),
- threadName(getCurrentThreadName()){}
+ threadName(getCurrentThreadName()) {}
- ~LoggingEventPrivate(){
+ ~LoggingEventPrivate()
+ {
delete ndc;
delete mdcCopy;
delete properties;
@@ -288,7 +290,9 @@ const LogString LoggingEvent::getCurrentThreadName()
{
#if APR_HAS_THREADS
LOG4CXX_THREAD_LOCAL LogString thread_name;
- if( thread_name.size() ){
+
+ if ( thread_name.size() )
+ {
return thread_name;
}
diff --git a/src/main/cpp/loggingeventpatternconverter.cpp b/src/main/cpp/loggingeventpatternconverter.cpp
index dd23340..df74b16 100644
--- a/src/main/cpp/loggingeventpatternconverter.cpp
+++ b/src/main/cpp/loggingeventpatternconverter.cpp
@@ -38,7 +38,8 @@ LoggingEventPatternConverter::LoggingEventPatternConverter(
}
LoggingEventPatternConverter::LoggingEventPatternConverter(std::unique_ptr<PatternConverterPrivate> priv) :
- PatternConverter (std::move(priv)){
+ PatternConverter (std::move(priv))
+{
}
diff --git a/src/main/cpp/mapfilter.cpp b/src/main/cpp/mapfilter.cpp
index ebde150..1665aca 100644
--- a/src/main/cpp/mapfilter.cpp
+++ b/src/main/cpp/mapfilter.cpp
@@ -29,9 +29,10 @@ using namespace log4cxx::helpers;
#define priv static_cast<MapFilterPrivate*>(m_priv.get())
-struct MapFilter::MapFilterPrivate : public FilterPrivate {
+struct MapFilter::MapFilterPrivate : public FilterPrivate
+{
MapFilterPrivate() : FilterPrivate(),
- acceptOnMatch(true), mustMatchAll(false){}
+ acceptOnMatch(true), mustMatchAll(false) {}
bool acceptOnMatch;
bool mustMatchAll; // true = AND; false = OR
@@ -45,7 +46,7 @@ MapFilter::MapFilter() : Filter(std::make_unique<MapFilterPrivate>())
}
-MapFilter::~MapFilter(){}
+MapFilter::~MapFilter() {}
void MapFilter::setOption( const LogString& option,
const LogString& value)
diff --git a/src/main/cpp/namepatternconverter.cpp b/src/main/cpp/namepatternconverter.cpp
index f5c6d0e..99f79bc 100644
--- a/src/main/cpp/namepatternconverter.cpp
+++ b/src/main/cpp/namepatternconverter.cpp
@@ -31,10 +31,11 @@ using namespace log4cxx::spi;
#define priv static_cast<NamePatternConverterPrivate*>(m_priv.get())
-struct NamePatternConverter::NamePatternConverterPrivate : public PatternConverterPrivate {
+struct NamePatternConverter::NamePatternConverterPrivate : public PatternConverterPrivate
+{
NamePatternConverterPrivate( const LogString& name, const LogString& style, const NameAbbreviatorPtr abbrev ) :
PatternConverterPrivate( name, style ),
- abbreviator(abbrev){}
+ abbreviator(abbrev) {}
/**
* Abbreviator.
@@ -49,7 +50,7 @@ NamePatternConverter::NamePatternConverter(
const LogString& style1,
const std::vector<LogString>& options) :
LoggingEventPatternConverter(std::make_unique<NamePatternConverterPrivate>(name1, style1,
- getAbbreviator(options)))
+ getAbbreviator(options)))
{
}
diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp
index 1e79f1a..1a105ea 100644
--- a/src/main/cpp/odbcappender.cpp
+++ b/src/main/cpp/odbcappender.cpp
@@ -146,7 +146,7 @@ void ODBCAppender::append(const spi::LoggingEventPtr& event, log4cxx::helpers::P
#if LOG4CXX_HAVE_ODBC
_priv->buffer.push_back(event);
- if (_priv->buffer.size() >=_priv->bufferSize)
+ if (_priv->buffer.size() >= _priv->bufferSize)
{
flushBuffer(p);
}
diff --git a/src/main/cpp/patternconverter.cpp b/src/main/cpp/patternconverter.cpp
index 304ef85..6e0e066 100644
--- a/src/main/cpp/patternconverter.cpp
+++ b/src/main/cpp/patternconverter.cpp
@@ -35,8 +35,9 @@ PatternConverter::PatternConverter(
}
PatternConverter::PatternConverter(const LogString& name,
- const LogString& style) :
- m_priv(std::make_unique<PatternConverterPrivate>(name,style)){
+ const LogString& style) :
+ m_priv(std::make_unique<PatternConverterPrivate>(name, style))
+{
}
diff --git a/src/main/cpp/patternlayout.cpp b/src/main/cpp/patternlayout.cpp
index fd34197..54d4c3c 100644
--- a/src/main/cpp/patternlayout.cpp
+++ b/src/main/cpp/patternlayout.cpp
@@ -55,10 +55,11 @@ using namespace log4cxx::helpers;
using namespace log4cxx::spi;
using namespace log4cxx::pattern;
-struct PatternLayout::PatternLayoutPrivate{
- PatternLayoutPrivate(){}
+struct PatternLayout::PatternLayoutPrivate
+{
+ PatternLayoutPrivate() {}
PatternLayoutPrivate(const LogString& pattern) :
- conversionPattern(pattern){}
+ conversionPattern(pattern) {}
/**
* Conversion pattern.
@@ -94,7 +95,7 @@ PatternLayout::PatternLayout(const LogString& pattern) :
activateOptions(pool);
}
-PatternLayout::~PatternLayout(){}
+PatternLayout::~PatternLayout() {}
void PatternLayout::setConversionPattern(const LogString& pattern)
{
diff --git a/src/main/cpp/propertiespatternconverter.cpp b/src/main/cpp/propertiespatternconverter.cpp
index 412548b..4ddf718 100644
--- a/src/main/cpp/propertiespatternconverter.cpp
+++ b/src/main/cpp/propertiespatternconverter.cpp
@@ -34,10 +34,11 @@ using namespace log4cxx::helpers;
#define priv static_cast<PropertiesPatternConverterPrivate*>(m_priv.get())
-struct PropertiesPatternConverter::PropertiesPatternConverterPrivate : public PatternConverterPrivate {
+struct PropertiesPatternConverter::PropertiesPatternConverterPrivate : public PatternConverterPrivate
+{
PropertiesPatternConverterPrivate( const LogString& name, const LogString& style, const LogString& propertyName ) :
PatternConverterPrivate( name, style ),
- option(propertyName){}
+ option(propertyName) {}
/**
* Name of property to output.
@@ -50,7 +51,7 @@ IMPLEMENT_LOG4CXX_OBJECT(PropertiesPatternConverter)
PropertiesPatternConverter::PropertiesPatternConverter(const LogString& name1,
const LogString& propertyName) :
LoggingEventPatternConverter(
- std::make_unique<PropertiesPatternConverterPrivate>(name1, LOG4CXX_STR("property"),propertyName))
+ std::make_unique<PropertiesPatternConverterPrivate>(name1, LOG4CXX_STR("property"), propertyName))
{
}
diff --git a/src/main/cpp/propertyconfigurator.cpp b/src/main/cpp/propertyconfigurator.cpp
index 49b998a..c299608 100644
--- a/src/main/cpp/propertyconfigurator.cpp
+++ b/src/main/cpp/propertyconfigurator.cpp
@@ -185,13 +185,21 @@ void PropertyConfigurator::doConfigure(helpers::Properties& properties,
}
LogString threadConfigurationValue(properties.getProperty(LOG4CXX_STR("log4j.threadConfiguration")));
- if( threadConfigurationValue == LOG4CXX_STR("NoConfiguration") ){
+
+ if ( threadConfigurationValue == LOG4CXX_STR("NoConfiguration") )
+ {
helpers::ThreadUtility::configure( ThreadConfigurationType::NoConfiguration );
- }else if( threadConfigurationValue == LOG4CXX_STR("BlockSignalsOnly") ){
+ }
+ else if ( threadConfigurationValue == LOG4CXX_STR("BlockSignalsOnly") )
+ {
helpers::ThreadUtility::configure( ThreadConfigurationType::BlockSignalsOnly );
- }else if( threadConfigurationValue == LOG4CXX_STR("NameThreadOnly") ){
+ }
+ else if ( threadConfigurationValue == LOG4CXX_STR("NameThreadOnly") )
+ {
helpers::ThreadUtility::configure( ThreadConfigurationType::NameThreadOnly );
- }else if( threadConfigurationValue == LOG4CXX_STR("BlockSignalsAndNameThread") ){
+ }
+ else if ( threadConfigurationValue == LOG4CXX_STR("BlockSignalsAndNameThread") )
+ {
helpers::ThreadUtility::configure( ThreadConfigurationType::BlockSignalsAndNameThread );
}
diff --git a/src/main/cpp/rollingfileappender.cpp b/src/main/cpp/rollingfileappender.cpp
index 31a2460..dece266 100644
--- a/src/main/cpp/rollingfileappender.cpp
+++ b/src/main/cpp/rollingfileappender.cpp
@@ -48,10 +48,11 @@ using namespace log4cxx::rolling;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-struct RollingFileAppender::RollingFileAppenderPriv : public FileAppenderPriv{
+struct RollingFileAppender::RollingFileAppenderPriv : public FileAppenderPriv
+{
RollingFileAppenderPriv() :
FileAppenderPriv(),
- fileLength(0){}
+ fileLength(0) {}
/**
* Triggering policy.
diff --git a/src/main/cpp/smtpappender.cpp b/src/main/cpp/smtpappender.cpp
index 7aee2b3..64c3c3b 100644
--- a/src/main/cpp/smtpappender.cpp
+++ b/src/main/cpp/smtpappender.cpp
@@ -377,14 +377,15 @@ class LOG4CXX_EXPORT DefaultEvaluator :
IMPLEMENT_LOG4CXX_OBJECT(DefaultEvaluator)
IMPLEMENT_LOG4CXX_OBJECT(SMTPAppender)
-struct SMTPAppender::SMTPPriv : public AppenderSkeletonPrivate {
+struct SMTPAppender::SMTPPriv : public AppenderSkeletonPrivate
+{
SMTPPriv() :
AppenderSkeletonPrivate(),
smtpPort(25),
bufferSize(512),
locationInfo(false),
cb(bufferSize),
- evaluator(new DefaultEvaluator()){}
+ evaluator(new DefaultEvaluator()) {}
SMTPPriv(spi::TriggeringEventEvaluatorPtr evaluator) :
AppenderSkeletonPrivate(),
@@ -392,7 +393,7 @@ struct SMTPAppender::SMTPPriv : public AppenderSkeletonPrivate {
bufferSize(512),
locationInfo(false),
cb(bufferSize),
- evaluator(evaluator){}
+ evaluator(evaluator) {}
LogString to;
LogString cc;
@@ -820,6 +821,7 @@ void SMTPAppender::setEvaluatorClass(const LogString& value)
_priv->evaluator = log4cxx::cast<TriggeringEventEvaluator>(obj);
}
-int SMTPAppender::getBufferSize() const{
+int SMTPAppender::getBufferSize() const
+{
}
diff --git a/src/main/cpp/sockethubappender.cpp b/src/main/cpp/sockethubappender.cpp
index 2508dce..fae4fdf 100644
--- a/src/main/cpp/sockethubappender.cpp
+++ b/src/main/cpp/sockethubappender.cpp
@@ -43,13 +43,14 @@ IMPLEMENT_LOG4CXX_OBJECT(SocketHubAppender)
int SocketHubAppender::DEFAULT_PORT = 4560;
-struct SocketHubAppender::SocketHubAppenderPriv : public AppenderSkeletonPrivate{
+struct SocketHubAppender::SocketHubAppenderPriv : public AppenderSkeletonPrivate
+{
SocketHubAppenderPriv(int port) :
AppenderSkeletonPrivate(),
port(port),
streams(),
locationInfo(false),
- thread(){}
+ thread() {}
int port;
ObjectOutputStreamList streams;
@@ -65,7 +66,7 @@ SocketHubAppender::~SocketHubAppender()
}
SocketHubAppender::SocketHubAppender()
- :AppenderSkeleton (std::make_unique<SocketHubAppenderPriv>(SocketHubAppender::DEFAULT_PORT))
+ : AppenderSkeleton (std::make_unique<SocketHubAppenderPriv>(SocketHubAppender::DEFAULT_PORT))
{
}
@@ -179,7 +180,7 @@ void SocketHubAppender::append(const spi::LoggingEventPtr& event, Pool& p)
try
{
-// event->write(**it, p);
+ // event->write(**it, p);
(*it)->flush(p);
it++;
}
diff --git a/src/main/cpp/socketoutputstream.cpp b/src/main/cpp/socketoutputstream.cpp
index 34fc06a..da32522 100644
--- a/src/main/cpp/socketoutputstream.cpp
+++ b/src/main/cpp/socketoutputstream.cpp
@@ -26,7 +26,8 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-struct SocketOutputStream::SocketOutputStreamPrivate{
+struct SocketOutputStream::SocketOutputStreamPrivate
+{
ByteList array;
SocketPtr socket;
};
diff --git a/src/main/cpp/stringmatchfilter.cpp b/src/main/cpp/stringmatchfilter.cpp
index eb6c113..b0e05bb 100644
--- a/src/main/cpp/stringmatchfilter.cpp
+++ b/src/main/cpp/stringmatchfilter.cpp
@@ -29,10 +29,11 @@ using namespace log4cxx::helpers;
#define priv static_cast<StringMatchFilterPrivate*>(m_priv.get())
-struct StringMatchFilter::StringMatchFilterPrivate : public FilterPrivate {
+struct StringMatchFilter::StringMatchFilterPrivate : public FilterPrivate
+{
StringMatchFilterPrivate() : FilterPrivate(),
- acceptOnMatch(true),
- stringToMatch(){}
+ acceptOnMatch(true),
+ stringToMatch() {}
bool acceptOnMatch;
LogString stringToMatch;
@@ -45,7 +46,7 @@ StringMatchFilter::StringMatchFilter() :
{
}
-StringMatchFilter::~StringMatchFilter(){}
+StringMatchFilter::~StringMatchFilter() {}
void StringMatchFilter::setOption(const LogString& option,
const LogString& value)
diff --git a/src/main/cpp/telnetappender.cpp b/src/main/cpp/telnetappender.cpp
index a3a4b9d..4c095bd 100644
--- a/src/main/cpp/telnetappender.cpp
+++ b/src/main/cpp/telnetappender.cpp
@@ -34,14 +34,15 @@ using namespace log4cxx::net;
IMPLEMENT_LOG4CXX_OBJECT(TelnetAppender)
-struct TelnetAppender::TelnetAppenderPriv : public AppenderSkeletonPrivate{
+struct TelnetAppender::TelnetAppenderPriv : public AppenderSkeletonPrivate
+{
TelnetAppenderPriv( int port, int maxConnections ) : AppenderSkeletonPrivate(),
port(port),
connections(maxConnections),
encoding(LOG4CXX_STR("UTF-8")),
encoder(CharsetEncoder::getUTF8Encoder()),
sh(),
- activeConnections(0){}
+ activeConnections(0) {}
int port;
ConnectionList connections;
@@ -61,7 +62,7 @@ const int TelnetAppender::DEFAULT_PORT = 23;
const int TelnetAppender::MAX_CONNECTIONS = 20;
TelnetAppender::TelnetAppender()
- : AppenderSkeleton (std::make_unique<TelnetAppenderPriv>(DEFAULT_PORT,MAX_CONNECTIONS))
+ : AppenderSkeleton (std::make_unique<TelnetAppenderPriv>(DEFAULT_PORT, MAX_CONNECTIONS))
{
}
@@ -311,10 +312,12 @@ void TelnetAppender::acceptConnections()
}
-int TelnetAppender::getPort() const{
+int TelnetAppender::getPort() const
+{
return _priv->port;
}
-void TelnetAppender::setPort(int port1){
+void TelnetAppender::setPort(int port1)
+{
_priv->port = port1;
}
diff --git a/src/main/cpp/threadutility.cpp b/src/main/cpp/threadutility.cpp
index b57ab66..3740b0a 100644
--- a/src/main/cpp/threadutility.cpp
+++ b/src/main/cpp/threadutility.cpp
@@ -23,14 +23,16 @@
#include <mutex>
#if LOG4CXX_HAS_SETTHREADDESCRIPTION
-#include <windows.h>
-#include <processthreadsapi.h>
+ #include <windows.h>
+ #include <processthreadsapi.h>
#endif
using log4cxx::helpers::ThreadUtility;
-struct ThreadUtility::priv_data{
- priv_data(){
+struct ThreadUtility::priv_data
+{
+ priv_data()
+ {
start_pre = nullptr;
started = nullptr;
start_post = nullptr;
@@ -42,8 +44,8 @@ struct ThreadUtility::priv_data{
};
#if LOG4CXX_HAS_PTHREAD_SIGMASK
-static thread_local sigset_t old_mask;
-static thread_local bool sigmask_valid;
+ static thread_local sigset_t old_mask;
+ static thread_local bool sigmask_valid;
#endif
ThreadUtility::ThreadUtility() :
@@ -51,99 +53,130 @@ ThreadUtility::ThreadUtility() :
{
// Block signals by default.
configureFuncs( std::bind( &ThreadUtility::preThreadBlockSignals, this ),
- nullptr,
- std::bind( &ThreadUtility::postThreadUnblockSignals, this ) );
+ nullptr,
+ std::bind( &ThreadUtility::postThreadUnblockSignals, this ) );
}
-ThreadUtility::~ThreadUtility(){}
+ThreadUtility::~ThreadUtility() {}
-std::shared_ptr<ThreadUtility> ThreadUtility::instance(){
+std::shared_ptr<ThreadUtility> ThreadUtility::instance()
+{
static std::shared_ptr<ThreadUtility> instance( new ThreadUtility() );
return instance;
}
-void ThreadUtility::configure( ThreadConfigurationType type ){
+void ThreadUtility::configure( ThreadConfigurationType type )
+{
std::shared_ptr<ThreadUtility> utility = instance();
- if( type == ThreadConfigurationType::NoConfiguration ){
+ if ( type == ThreadConfigurationType::NoConfiguration )
+ {
utility->configureFuncs( nullptr, nullptr, nullptr );
- }else if( type == ThreadConfigurationType::NameThreadOnly ){
+ }
+ else if ( type == ThreadConfigurationType::NameThreadOnly )
+ {
utility->configureFuncs( nullptr,
- std::bind( &ThreadUtility::threadStartedNameThread, utility,
- std::placeholders::_1,
- std::placeholders::_2,
- std::placeholders::_3 ),
- nullptr );
- }else if( type == ThreadConfigurationType::BlockSignalsOnly ){
+ std::bind( &ThreadUtility::threadStartedNameThread, utility,
+ std::placeholders::_1,
+ std::placeholders::_2,
+ std::placeholders::_3 ),
+ nullptr );
+ }
+ else if ( type == ThreadConfigurationType::BlockSignalsOnly )
+ {
utility->configureFuncs( std::bind( &ThreadUtility::preThreadBlockSignals, utility ),
- nullptr,
- std::bind( &ThreadUtility::postThreadUnblockSignals, utility ) );
- }else if( type == ThreadConfigurationType::BlockSignalsAndNameThread ){
+ nullptr,
+ std::bind( &ThreadUtility::postThreadUnblockSignals, utility ) );
+ }
+ else if ( type == ThreadConfigurationType::BlockSignalsAndNameThread )
+ {
utility->configureFuncs( std::bind( &ThreadUtility::preThreadBlockSignals, utility ),
- std::bind( &ThreadUtility::threadStartedNameThread, utility,
- std::placeholders::_1,
- std::placeholders::_2,
- std::placeholders::_3 ),
- std::bind( &ThreadUtility::postThreadUnblockSignals, utility ) );
+ std::bind( &ThreadUtility::threadStartedNameThread, utility,
+ std::placeholders::_1,
+ std::placeholders::_2,
+ std::placeholders::_3 ),
+ std::bind( &ThreadUtility::postThreadUnblockSignals, utility ) );
}
}
void ThreadUtility::configureFuncs( ThreadStartPre pre_start,
- ThreadStarted started,
- ThreadStartPost post_start ){
+ ThreadStarted started,
+ ThreadStartPost post_start )
+{
m_priv->start_pre = pre_start;
m_priv->started = started;
m_priv->start_post = post_start;
}
-void ThreadUtility::preThreadBlockSignals(){
+void ThreadUtility::preThreadBlockSignals()
+{
#if LOG4CXX_HAS_PTHREAD_SIGMASK
sigset_t set;
sigfillset(&set);
- if( pthread_sigmask(SIG_SETMASK, &set, &old_mask) < 0 ){
+
+ if ( pthread_sigmask(SIG_SETMASK, &set, &old_mask) < 0 )
+ {
LOGLOG_ERROR( LOG4CXX_STR("Unable to set thread sigmask") );
sigmask_valid = false;
- }else{
+ }
+ else
+ {
sigmask_valid = true;
}
+
#endif /* LOG4CXX_HAS_PTHREAD_SIGMASK */
}
void ThreadUtility::threadStartedNameThread(LogString threadName,
- std::thread::id /*threadId*/,
- std::thread::native_handle_type nativeHandle){
+ std::thread::id /*threadId*/,
+ std::thread::native_handle_type nativeHandle)
+{
#if LOG4CXX_HAS_PTHREAD_SETNAME
- if( pthread_setname_np( static_cast<pthread_t>( nativeHandle ), threadName.c_str() ) < 0 ){
+
+ if ( pthread_setname_np( static_cast<pthread_t>( nativeHandle ), threadName.c_str() ) < 0 )
+ {
LOGLOG_ERROR( LOG4CXX_STR("unable to set thread name") );
}
+
#elif LOG4CXX_HAS_SETTHREADDESCRIPTION
HRESULT hr = SetThreadDescription(static_cast<HANDLE>(nativeHandle), threadName.c_str());
- if(FAILED(hr)){
+
+ if (FAILED(hr))
+ {
LOGLOG_ERROR( LOG4CXX_STR("unable to set thread name") );
}
+
#endif
}
-void ThreadUtility::postThreadUnblockSignals(){
+void ThreadUtility::postThreadUnblockSignals()
+{
#if LOG4CXX_HAS_PTHREAD_SIGMASK
+
// Only restore the signal mask if we were able to set it in the first place.
- if( sigmask_valid ){
- if( pthread_sigmask(SIG_SETMASK, &old_mask, nullptr) < 0 ){
+ if ( sigmask_valid )
+ {
+ if ( pthread_sigmask(SIG_SETMASK, &old_mask, nullptr) < 0 )
+ {
LOGLOG_ERROR( LOG4CXX_STR("Unable to set thread sigmask") );
}
}
+
#endif /* LOG4CXX_HAS_PTHREAD_SIGMASK */
}
-log4cxx::helpers::ThreadStartPre ThreadUtility::preStartFunction(){
+log4cxx::helpers::ThreadStartPre ThreadUtility::preStartFunction()
+{
return m_priv->start_pre;
}
-log4cxx::helpers::ThreadStarted ThreadUtility::threadStartedFunction(){
+log4cxx::helpers::ThreadStarted ThreadUtility::threadStartedFunction()
+{
return m_priv->started;
}
-log4cxx::helpers::ThreadStartPost ThreadUtility::postStartFunction(){
+log4cxx::helpers::ThreadStartPost ThreadUtility::postStartFunction()
+{
return m_priv->start_post;
}
diff --git a/src/main/cpp/throwableinformationpatternconverter.cpp b/src/main/cpp/throwableinformationpatternconverter.cpp
index 4b80bb7..202db92 100644
--- a/src/main/cpp/throwableinformationpatternconverter.cpp
+++ b/src/main/cpp/throwableinformationpatternconverter.cpp
@@ -33,10 +33,11 @@ using namespace log4cxx::spi;
using namespace log4cxx::helpers;
struct ThrowableInformationPatternConverter::ThrowableInformationPatternConverterPrivate :
- public PatternConverterPrivate {
+ public PatternConverterPrivate
+{
ThrowableInformationPatternConverterPrivate( const LogString& name, const LogString& style, bool shortReport ) :
PatternConverterPrivate( name, style ),
- shortReport(shortReport){}
+ shortReport(shortReport) {}
/**
* If "short", only first line of throwable report will be formatted.
@@ -50,8 +51,8 @@ ThrowableInformationPatternConverter::ThrowableInformationPatternConverter(bool
LoggingEventPatternConverter(
std::make_unique<ThrowableInformationPatternConverterPrivate>(
LOG4CXX_STR("Throwable"),
- LOG4CXX_STR("throwable"),
- shortReport1))
+ LOG4CXX_STR("throwable"),
+ shortReport1))
{
}
diff --git a/src/main/cpp/writerappender.cpp b/src/main/cpp/writerappender.cpp
index 52ffaf3..afe61cf 100644
--- a/src/main/cpp/writerappender.cpp
+++ b/src/main/cpp/writerappender.cpp
@@ -50,7 +50,8 @@ WriterAppender::WriterAppender(const LayoutPtr& layout1)
}
WriterAppender::WriterAppender(std::unique_ptr<WriterAppenderPriv> priv)
- : AppenderSkeleton (std::move(priv)){
+ : AppenderSkeleton (std::move(priv))
+{
}
@@ -316,6 +317,7 @@ void WriterAppender::setImmediateFlush(bool value)
_priv->immediateFlush = value;
}
-bool WriterAppender::getImmediateFlush() const{
+bool WriterAppender::getImmediateFlush() const
+{
return _priv->immediateFlush;
}
diff --git a/src/main/cpp/xmllayout.cpp b/src/main/cpp/xmllayout.cpp
index 2f8d7bd..987e870 100644
--- a/src/main/cpp/xmllayout.cpp
+++ b/src/main/cpp/xmllayout.cpp
@@ -32,8 +32,9 @@ using namespace log4cxx::helpers;
using namespace log4cxx::spi;
using namespace log4cxx::xml;
-struct XMLLayout::XMLLayoutPrivate{
- XMLLayoutPrivate() : locationInfo(false), properties(false){}
+struct XMLLayout::XMLLayoutPrivate
+{
+ XMLLayoutPrivate() : locationInfo(false), properties(false) {}
// Print no location info by default
bool locationInfo; //= false
@@ -47,7 +48,7 @@ XMLLayout::XMLLayout()
{
}
-XMLLayout::~XMLLayout(){}
+XMLLayout::~XMLLayout() {}
void XMLLayout::setOption(const LogString& option,
const LogString& value)
diff --git a/src/main/cpp/xmlsocketappender.cpp b/src/main/cpp/xmlsocketappender.cpp
index a2285fe..78b0a0c 100644
--- a/src/main/cpp/xmlsocketappender.cpp
+++ b/src/main/cpp/xmlsocketappender.cpp
@@ -34,15 +34,16 @@ using namespace log4cxx::helpers;
using namespace log4cxx::net;
using namespace log4cxx::xml;
-struct XMLSocketAppender::XMLSocketAppenderPriv : public SocketAppenderSkeletonPriv {
+struct XMLSocketAppender::XMLSocketAppenderPriv : public SocketAppenderSkeletonPriv
+{
XMLSocketAppenderPriv(int defaultPort, int reconnectionDelay) :
- SocketAppenderSkeletonPriv(defaultPort, reconnectionDelay){}
+ SocketAppenderSkeletonPriv(defaultPort, reconnectionDelay) {}
XMLSocketAppenderPriv(InetAddressPtr address, int defaultPort, int reconnectionDelay) :
- SocketAppenderSkeletonPriv( address, defaultPort, reconnectionDelay ){}
+ SocketAppenderSkeletonPriv( address, defaultPort, reconnectionDelay ) {}
XMLSocketAppenderPriv(const LogString& host, int port, int delay) :
- SocketAppenderSkeletonPriv( host, port, delay ){}
+ SocketAppenderSkeletonPriv( host, port, delay ) {}
log4cxx::helpers::WriterPtr writer;
};
diff --git a/src/main/cpp/zipcompressaction.cpp b/src/main/cpp/zipcompressaction.cpp
index 410710f..7520675 100644
--- a/src/main/cpp/zipcompressaction.cpp
+++ b/src/main/cpp/zipcompressaction.cpp
@@ -28,11 +28,12 @@ using namespace log4cxx::helpers;
#define priv static_cast<ZipCompressActionPrivate*>(m_priv.get())
-struct ZipCompressAction::ZipCompressActionPrivate : public ActionPrivate{
+struct ZipCompressAction::ZipCompressActionPrivate : public ActionPrivate
+{
ZipCompressActionPrivate( const File& toRename,
- const File& renameTo,
- bool deleteSource):
- source(toRename), destination(renameTo), deleteSource(deleteSource){}
+ const File& renameTo,
+ bool deleteSource):
+ source(toRename), destination(renameTo), deleteSource(deleteSource) {}
const File source;
const File destination;
@@ -45,7 +46,7 @@ ZipCompressAction::ZipCompressAction(const File& src,
const File& dest,
bool del)
: Action(std::make_unique<ZipCompressActionPrivate>(
- src, dest, del))
+ src, dest, del))
{
}
diff --git a/src/main/include/log4cxx/appenderskeleton.h b/src/main/include/log4cxx/appenderskeleton.h
index bb7c783..709cdea 100644
--- a/src/main/include/log4cxx/appenderskeleton.h
+++ b/src/main/include/log4cxx/appenderskeleton.h
@@ -173,7 +173,7 @@ class LOG4CXX_EXPORT AppenderSkeleton :
*/
void setThreshold(const LevelPtr& threshold);
-protected:
+ protected:
std::unique_ptr<AppenderSkeletonPrivate> m_priv;
}; // class AppenderSkeleton
diff --git a/src/main/include/log4cxx/asyncappender.h b/src/main/include/log4cxx/asyncappender.h
index c427244..9f4339b 100644
--- a/src/main/include/log4cxx/asyncappender.h
+++ b/src/main/include/log4cxx/asyncappender.h
@@ -57,8 +57,8 @@ class LOG4CXX_EXPORT AsyncAppender :
public virtual spi::AppenderAttachable,
public virtual AppenderSkeleton
{
-protected:
- struct AsyncAppenderPriv;
+ protected:
+ struct AsyncAppenderPriv;
public:
DECLARE_LOG4CXX_OBJECT(AsyncAppender)
diff --git a/src/main/include/log4cxx/consoleappender.h b/src/main/include/log4cxx/consoleappender.h
index 2cb4f91..49d9382 100644
--- a/src/main/include/log4cxx/consoleappender.h
+++ b/src/main/include/log4cxx/consoleappender.h
@@ -35,8 +35,8 @@ namespace log4cxx
*/
class LOG4CXX_EXPORT ConsoleAppender : public WriterAppender
{
-private:
- struct ConsoleAppenderPriv;
+ private:
+ struct ConsoleAppenderPriv;
public:
DECLARE_LOG4CXX_OBJECT(ConsoleAppender)
diff --git a/src/main/include/log4cxx/db/odbcappender.h b/src/main/include/log4cxx/db/odbcappender.h
index 67e46eb..aab2d45 100644
--- a/src/main/include/log4cxx/db/odbcappender.h
+++ b/src/main/include/log4cxx/db/odbcappender.h
@@ -228,7 +228,7 @@ class LOG4CXX_EXPORT ODBCAppender : public AppenderSkeleton
static void encode(unsigned short** dest, const LogString& src,
log4cxx::helpers::Pool& p);
-protected:
+ protected:
struct ODBCAppenderPriv;
}; // class ODBCAppender
LOG4CXX_PTR_DEF(ODBCAppender);
diff --git a/src/main/include/log4cxx/fileappender.h b/src/main/include/log4cxx/fileappender.h
index 39c6d9d..19a4ea9 100644
--- a/src/main/include/log4cxx/fileappender.h
+++ b/src/main/include/log4cxx/fileappender.h
@@ -45,8 +45,8 @@ class Pool;
*/
class LOG4CXX_EXPORT FileAppender : public WriterAppender
{
-protected:
- struct FileAppenderPriv;
+ protected:
+ struct FileAppenderPriv;
public:
DECLARE_LOG4CXX_OBJECT(FileAppender)
@@ -208,7 +208,7 @@ protected:
private:
FileAppender(const FileAppender&);
FileAppender& operator=(const FileAppender&);
-protected:
+ protected:
FileAppender(std::unique_ptr<FileAppenderPriv> priv);
}; // class FileAppender
diff --git a/src/main/include/log4cxx/helpers/bufferedwriter.h b/src/main/include/log4cxx/helpers/bufferedwriter.h
index 6bc7a12..685c3d7 100644
--- a/src/main/include/log4cxx/helpers/bufferedwriter.h
+++ b/src/main/include/log4cxx/helpers/bufferedwriter.h
@@ -37,9 +37,9 @@ namespace helpers
*/
class LOG4CXX_EXPORT BufferedWriter : public Writer
{
-private:
- struct BufferedWriterPriv;
- std::unique_ptr<BufferedWriterPriv> m_priv;
+ private:
+ struct BufferedWriterPriv;
+ std::unique_ptr<BufferedWriterPriv> m_priv;
public:
DECLARE_ABSTRACT_LOG4CXX_OBJECT(BufferedWriter)
diff --git a/src/main/include/log4cxx/helpers/cyclicbuffer.h b/src/main/include/log4cxx/helpers/cyclicbuffer.h
index f05a9e9..10b9679 100644
--- a/src/main/include/log4cxx/helpers/cyclicbuffer.h
+++ b/src/main/include/log4cxx/helpers/cyclicbuffer.h
@@ -34,9 +34,9 @@ just the first or last element.
*/
class LOG4CXX_EXPORT CyclicBuffer
{
- private:
- struct CyclicBufferPriv;
- std::unique_ptr<CyclicBufferPriv> m_priv;
+ private:
+ struct CyclicBufferPriv;
+ std::unique_ptr<CyclicBufferPriv> m_priv;
public:
/**
diff --git a/src/main/include/log4cxx/helpers/threadutility.h b/src/main/include/log4cxx/helpers/threadutility.h
index 35ddba7..e9b1d82 100644
--- a/src/main/include/log4cxx/helpers/threadutility.h
+++ b/src/main/include/log4cxx/helpers/threadutility.h
@@ -24,8 +24,10 @@
#include "log4cxx/logstring.h"
-namespace log4cxx {
-namespace helpers {
+namespace log4cxx
+{
+namespace helpers
+{
/**
* A function that will be called before a thread is started. This can
@@ -44,8 +46,8 @@ typedef std::function<void()> ThreadStartPre;
* std::thread::native_handle
*/
typedef std::function<void( LogString threadName,
- std::thread::id threadId,
- std::thread::native_handle_type nativeHandle )> ThreadStarted;
+ std::thread::id threadId,
+ std::thread::native_handle_type nativeHandle )> ThreadStarted;
/**
* Called after a thread has started. This can be used to (for example)
@@ -53,7 +55,8 @@ typedef std::function<void( LogString threadName,
*/
typedef std::function<void()> ThreadStartPost;
-enum class ThreadConfigurationType {
+enum class ThreadConfigurationType
+{
NoConfiguration,
BlockSignalsOnly,
NameThreadOnly,
@@ -63,84 +66,93 @@ enum class ThreadConfigurationType {
class ThreadUtility;
LOG4CXX_PTR_DEF(ThreadUtility);
-class LOG4CXX_EXPORT ThreadUtility {
-private:
- ThreadUtility();
-
- log4cxx::helpers::ThreadStartPre preStartFunction();
- log4cxx::helpers::ThreadStarted threadStartedFunction();
- log4cxx::helpers::ThreadStartPost postStartFunction();
-
- struct priv_data;
- std::unique_ptr<priv_data> m_priv;
-
-public:
- ~ThreadUtility();
-
- static std::shared_ptr<ThreadUtility> instance();
-
- /**
- * Utility method for configuring the ThreadUtility in a standard
- * configuration.
- */
- static void configure( ThreadConfigurationType type );
-
- /**
- * Configure the thread functions that log4cxx will use.
- * Note that setting any of these parameters to nullptr is valid,
- * and simply results in the callback not being called.
- */
- void configureFuncs( ThreadStartPre pre_start,
- ThreadStarted started,
- ThreadStartPost post_start );
-
- /**
- * A pre-start thread function that blocks signals to the new thread
- * (if the system has pthreads). If the system does not have pthreads,
- * does nothing.
- */
- void preThreadBlockSignals();
-
- /**
- * A thread_started function that names the thread using the appropriate
- * system call.
- */
- void threadStartedNameThread(LogString threadName,
- std::thread::id thread_id,
- std::thread::native_handle_type native_handle);
-
- /**
- * A post-start thread function that unblocks signals that preThreadBlockSignals
- * blocked before starting the thread. If the system does not have pthreads,
- * does nothing.
- */
- void postThreadUnblockSignals();
-
- /**
- * Start a thread
- */
- template<class Function, class... Args>
- std::thread createThread(LogString name,
- Function&& f,
- Args&&... args){
- log4cxx::helpers::ThreadStartPre pre_start = preStartFunction();
- log4cxx::helpers::ThreadStarted thread_start = threadStartedFunction();
- log4cxx::helpers::ThreadStartPost post_start = postStartFunction();
-
- if( pre_start ){
- pre_start();
+class LOG4CXX_EXPORT ThreadUtility
+{
+ private:
+ ThreadUtility();
+
+ log4cxx::helpers::ThreadStartPre preStartFunction();
+ log4cxx::helpers::ThreadStarted threadStartedFunction();
+ log4cxx::helpers::ThreadStartPost postStartFunction();
+
+ struct priv_data;
+ std::unique_ptr<priv_data> m_priv;
+
+ public:
+ ~ThreadUtility();
+
+ static std::shared_ptr<ThreadUtility> instance();
+
+ /**
+ * Utility method for configuring the ThreadUtility in a standard
+ * configuration.
+ */
+ static void configure( ThreadConfigurationType type );
+
+ /**
+ * Configure the thread functions that log4cxx will use.
+ * Note that setting any of these parameters to nullptr is valid,
+ * and simply results in the callback not being called.
+ */
+ void configureFuncs( ThreadStartPre pre_start,
+ ThreadStarted started,
+ ThreadStartPost post_start );
+
+ /**
+ * A pre-start thread function that blocks signals to the new thread
+ * (if the system has pthreads). If the system does not have pthreads,
+ * does nothing.
+ */
+ void preThreadBlockSignals();
+
+ /**
+ * A thread_started function that names the thread using the appropriate
+ * system call.
+ */
+ void threadStartedNameThread(LogString threadName,
+ std::thread::id thread_id,
+ std::thread::native_handle_type native_handle);
+
+ /**
+ * A post-start thread function that unblocks signals that preThreadBlockSignals
+ * blocked before starting the thread. If the system does not have pthreads,
+ * does nothing.
+ */
+ void postThreadUnblockSignals();
+
+ /**
+ * Start a thread
+ */
+ template<class Function, class... Args>
+ std::thread createThread(LogString name,
+ Function&& f,
+ Args&& ... args)
+ {
+ log4cxx::helpers::ThreadStartPre pre_start = preStartFunction();
+ log4cxx::helpers::ThreadStarted thread_start = threadStartedFunction();
+ log4cxx::helpers::ThreadStartPost post_start = postStartFunction();
+
+ if ( pre_start )
+ {
+ pre_start();
+ }
+
+ std::thread t( f, args... );
+
+ if ( thread_start )
+ {
+ thread_start( name,
+ t.get_id(),
+ t.native_handle() );
+ }
+
+ if ( post_start )
+ {
+ post_start();
+ }
+
+ return t;
}
- std::thread t( f, args... );
- if( thread_start ){
- thread_start( name,
- t.get_id(),
- t.native_handle() );
- }
- if( post_start ){
- post_start();
- }
- return t;
- }
};
} /* namespace helpers */
diff --git a/src/main/include/log4cxx/net/socketappenderskeleton.h b/src/main/include/log4cxx/net/socketappenderskeleton.h
index ccad0bd..95991dc 100644
--- a/src/main/include/log4cxx/net/socketappenderskeleton.h
+++ b/src/main/include/log4cxx/net/socketappenderskeleton.h
@@ -40,8 +40,8 @@ namespace net
*/
class LOG4CXX_EXPORT SocketAppenderSkeleton : public AppenderSkeleton
{
-protected:
- struct SocketAppenderSkeletonPriv;
+ protected:
+ struct SocketAppenderSkeletonPriv;
public:
SocketAppenderSkeleton(std::unique_ptr<SocketAppenderSkeletonPriv> priv);
diff --git a/src/main/include/log4cxx/pattern/formattinginfo.h b/src/main/include/log4cxx/pattern/formattinginfo.h
index 66c472d..372bcd7 100644
--- a/src/main/include/log4cxx/pattern/formattinginfo.h
+++ b/src/main/include/log4cxx/pattern/formattinginfo.h
@@ -42,8 +42,8 @@ typedef std::shared_ptr<FormattingInfo> FormattingInfoPtr;
*/
class LOG4CXX_EXPORT FormattingInfo : public virtual log4cxx::helpers::Object
{
- struct FormattingInfoPrivate;
- std::unique_ptr<FormattingInfoPrivate> m_priv;
+ struct FormattingInfoPrivate;
+ std::unique_ptr<FormattingInfoPrivate> m_priv;
public:
DECLARE_ABSTRACT_LOG4CXX_OBJECT(FormattingInfo)
diff --git a/src/main/include/log4cxx/pattern/literalpatternconverter.h b/src/main/include/log4cxx/pattern/literalpatternconverter.h
index aa2f35c..ce66edd 100644
--- a/src/main/include/log4cxx/pattern/literalpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/literalpatternconverter.h
@@ -39,7 +39,7 @@ namespace pattern
*/
class LOG4CXX_EXPORT LiteralPatternConverter : public LoggingEventPatternConverter
{
- struct LiteralPatternConverterPrivate;
+ struct LiteralPatternConverterPrivate;
/**
* Create a new instance.
diff --git a/src/main/include/log4cxx/pattern/namepatternconverter.h b/src/main/include/log4cxx/pattern/namepatternconverter.h
index b38381e..436a5e2 100644
--- a/src/main/include/log4cxx/pattern/namepatternconverter.h
+++ b/src/main/include/log4cxx/pattern/namepatternconverter.h
@@ -35,7 +35,7 @@ namespace pattern
*/
class LOG4CXX_EXPORT NamePatternConverter : public LoggingEventPatternConverter
{
- struct NamePatternConverterPrivate;
+ struct NamePatternConverterPrivate;
public:
DECLARE_LOG4CXX_PATTERN(NamePatternConverter)
diff --git a/src/main/include/log4cxx/pattern/patternconverter.h b/src/main/include/log4cxx/pattern/patternconverter.h
index a5e17b7..af04162 100644
--- a/src/main/include/log4cxx/pattern/patternconverter.h
+++ b/src/main/include/log4cxx/pattern/patternconverter.h
@@ -66,7 +66,7 @@ class LOG4CXX_EXPORT PatternConverter : public virtual log4cxx::helpers::Object
* @param style CSS style for formatted output.
*/
PatternConverter(const LogString& name,
- const LogString& style);
+ const LogString& style);
virtual ~PatternConverter();
diff --git a/src/main/include/log4cxx/pattern/propertiespatternconverter.h b/src/main/include/log4cxx/pattern/propertiespatternconverter.h
index 2416f28..f54e349 100644
--- a/src/main/include/log4cxx/pattern/propertiespatternconverter.h
+++ b/src/main/include/log4cxx/pattern/propertiespatternconverter.h
@@ -39,7 +39,7 @@ namespace pattern
class LOG4CXX_EXPORT PropertiesPatternConverter
: public LoggingEventPatternConverter
{
- struct PropertiesPatternConverterPrivate;
+ struct PropertiesPatternConverterPrivate;
/**
* Private constructor.
diff --git a/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h b/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h
index f8ad5ad..2ffe457 100644
--- a/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h
@@ -37,7 +37,7 @@ namespace pattern
class LOG4CXX_EXPORT ThrowableInformationPatternConverter
: public LoggingEventPatternConverter
{
- struct ThrowableInformationPatternConverterPrivate;
+ struct ThrowableInformationPatternConverterPrivate;
/**
* Private constructor.
diff --git a/src/main/include/log4cxx/private/action_priv.h b/src/main/include/log4cxx/private/action_priv.h
index 3fdb29a..d5dea92 100644
--- a/src/main/include/log4cxx/private/action_priv.h
+++ b/src/main/include/log4cxx/private/action_priv.h
@@ -19,14 +19,17 @@
#include <log4cxx/rolling/action.h>
-namespace log4cxx{
-namespace rolling{
-
-struct Action::ActionPrivate{
- ActionPrivate() :
- complete(false),
- interrupted(false),
- pool(){}
+namespace log4cxx
+{
+namespace rolling
+{
+
+struct Action::ActionPrivate
+{
+ ActionPrivate() :
+ complete(false),
+ interrupted(false),
+ pool() {}
/**
* Is action complete.
diff --git a/src/main/include/log4cxx/private/appenderskeleton_priv.h b/src/main/include/log4cxx/private/appenderskeleton_priv.h
index 0ee66ae..07a7457 100644
--- a/src/main/include/log4cxx/private/appenderskeleton_priv.h
+++ b/src/main/include/log4cxx/private/appenderskeleton_priv.h
@@ -22,50 +22,52 @@
#include <log4cxx/helpers/onlyonceerrorhandler.h>
#include <memory>
-namespace log4cxx {
+namespace log4cxx
+{
-struct AppenderSkeleton::AppenderSkeletonPrivate {
- AppenderSkeletonPrivate() :
- threshold(Level::getAll()),
- errorHandler(std::make_shared<log4cxx::helpers::OnlyOnceErrorHandler>()),
- closed(false){}
+struct AppenderSkeleton::AppenderSkeletonPrivate
+{
+ AppenderSkeletonPrivate() :
+ threshold(Level::getAll()),
+ errorHandler(std::make_shared<log4cxx::helpers::OnlyOnceErrorHandler>()),
+ closed(false) {}
- AppenderSkeletonPrivate( LayoutPtr lay ) :
- layout( lay ),
- threshold(Level::getAll()),
- errorHandler(std::make_shared<log4cxx::helpers::OnlyOnceErrorHandler>()),
- closed(false){}
+ AppenderSkeletonPrivate( LayoutPtr lay ) :
+ layout( lay ),
+ threshold(Level::getAll()),
+ errorHandler(std::make_shared<log4cxx::helpers::OnlyOnceErrorHandler>()),
+ closed(false) {}
- /** The layout variable does not need to be set if the appender
- implementation has its own layout. */
- LayoutPtr layout;
+ /** The layout variable does not need to be set if the appender
+ implementation has its own layout. */
+ LayoutPtr layout;
- /** Appenders are named. */
- LogString name;
+ /** Appenders are named. */
+ LogString name;
- /**
- There is no level threshold filtering by default. */
- LevelPtr threshold;
+ /**
+ There is no level threshold filtering by default. */
+ LevelPtr threshold;
- /**
- It is assumed and enforced that errorHandler is never null.
- */
- spi::ErrorHandlerPtr errorHandler;
+ /**
+ It is assumed and enforced that errorHandler is never null.
+ */
+ spi::ErrorHandlerPtr errorHandler;
- /** The first filter in the filter chain. Set to <code>null</code>
- initially. */
- spi::FilterPtr headFilter;
+ /** The first filter in the filter chain. Set to <code>null</code>
+ initially. */
+ spi::FilterPtr headFilter;
- /** The last filter in the filter chain. */
- spi::FilterPtr tailFilter;
+ /** The last filter in the filter chain. */
+ spi::FilterPtr tailFilter;
- /**
- Is this appender closed?
- */
- bool closed;
+ /**
+ Is this appender closed?
+ */
+ bool closed;
- log4cxx::helpers::Pool pool;
- mutable log4cxx::shared_mutex mutex;
+ log4cxx::helpers::Pool pool;
+ mutable log4cxx::shared_mutex mutex;
};
}
diff --git a/src/main/include/log4cxx/private/fileappender_priv.h b/src/main/include/log4cxx/private/fileappender_priv.h
index ac0a742..e035e6a 100644
--- a/src/main/include/log4cxx/private/fileappender_priv.h
+++ b/src/main/include/log4cxx/private/fileappender_priv.h
@@ -21,33 +21,35 @@
#include <log4cxx/private/writerappender_priv.h>
#include <log4cxx/fileappender.h>
-namespace log4cxx{
-
-struct FileAppender::FileAppenderPriv : public WriterAppender::WriterAppenderPriv {
- FileAppenderPriv() : WriterAppenderPriv(){}
-
- FileAppenderPriv(LayoutPtr layout) : WriterAppenderPriv(layout){}
-
- /** Append to or truncate the file? The default value for this
- variable is <code>true</code>, meaning that by default a
- <code>FileAppender</code> will append to an existing file and
- not truncate it.
- <p>This option is meaningful only if the FileAppender opens the
- file.
- */
- bool fileAppend;
-
- /**
- The name of the log file. */
- LogString fileName;
-
- /**
- Do we do bufferedIO? */
- bool bufferedIO;
-
- /**
- How big should the IO buffer be? Default is 8K. */
- int bufferSize;
+namespace log4cxx
+{
+
+struct FileAppender::FileAppenderPriv : public WriterAppender::WriterAppenderPriv
+{
+ FileAppenderPriv() : WriterAppenderPriv() {}
+
+ FileAppenderPriv(LayoutPtr layout) : WriterAppenderPriv(layout) {}
+
+ /** Append to or truncate the file? The default value for this
+ variable is <code>true</code>, meaning that by default a
+ <code>FileAppender</code> will append to an existing file and
+ not truncate it.
+ <p>This option is meaningful only if the FileAppender opens the
+ file.
+ */
+ bool fileAppend;
+
+ /**
+ The name of the log file. */
+ LogString fileName;
+
+ /**
+ Do we do bufferedIO? */
+ bool bufferedIO;
+
+ /**
+ How big should the IO buffer be? Default is 8K. */
+ int bufferSize;
};
}
diff --git a/src/main/include/log4cxx/private/filter_priv.h b/src/main/include/log4cxx/private/filter_priv.h
index 68d8dca..fb9b086 100644
--- a/src/main/include/log4cxx/private/filter_priv.h
+++ b/src/main/include/log4cxx/private/filter_priv.h
@@ -24,11 +24,12 @@ namespace log4cxx
namespace spi
{
-struct Filter::FilterPrivate{
- /**
- Points to the next filter in the filter chain.
- */
- FilterPtr next;
+struct Filter::FilterPrivate
+{
+ /**
+ Points to the next filter in the filter chain.
+ */
+ FilterPtr next;
};
}
diff --git a/src/main/include/log4cxx/private/odbcappender_priv.h b/src/main/include/log4cxx/private/odbcappender_priv.h
index 547fdc0..28bee4f 100644
--- a/src/main/include/log4cxx/private/odbcappender_priv.h
+++ b/src/main/include/log4cxx/private/odbcappender_priv.h
@@ -23,62 +23,65 @@
#include <list>
-namespace log4cxx{
-namespace db{
+namespace log4cxx
+{
+namespace db
+{
-struct ODBCAppender::ODBCAppenderPriv : public AppenderSkeleton::AppenderSkeletonPrivate {
- ODBCAppenderPriv() :
- AppenderSkeletonPrivate(),
- connection(nullptr),
- env(nullptr),
- bufferSize(1){}
+struct ODBCAppender::ODBCAppenderPriv : public AppenderSkeleton::AppenderSkeletonPrivate
+{
+ ODBCAppenderPriv() :
+ AppenderSkeletonPrivate(),
+ connection(nullptr),
+ env(nullptr),
+ bufferSize(1) {}
- /**
- * URL of the DB for default connection handling
- */
- LogString databaseURL;
+ /**
+ * URL of the DB for default connection handling
+ */
+ LogString databaseURL;
- /**
- * User to connect as for default connection handling
- */
- LogString databaseUser;
+ /**
+ * User to connect as for default connection handling
+ */
+ LogString databaseUser;
- /**
- * User to use for default connection handling
- */
- LogString databasePassword;
+ /**
+ * User to use for default connection handling
+ */
+ LogString databasePassword;
- /**
- * Connection used by default. The connection is opened the first time it
- * is needed and then held open until the appender is closed (usually at
- * garbage collection). This behavior is best modified by creating a
- * sub-class and overriding the <code>getConnection</code> and
- * <code>closeConnection</code> methods.
- */
- log4cxx::db::ODBCAppender::SQLHDBC connection;
- log4cxx::db::ODBCAppender::SQLHENV env;
+ /**
+ * Connection used by default. The connection is opened the first time it
+ * is needed and then held open until the appender is closed (usually at
+ * garbage collection). This behavior is best modified by creating a
+ * sub-class and overriding the <code>getConnection</code> and
+ * <code>closeConnection</code> methods.
+ */
+ log4cxx::db::ODBCAppender::SQLHDBC connection;
+ log4cxx::db::ODBCAppender::SQLHENV env;
- /**
- * Stores the string given to the pattern layout for conversion into a SQL
- * statement, eg: insert into LogTable (Thread, File, Message) values
- * ("%t", "%F", "%m")
- *
- * Be careful of quotes in your messages!
- *
- * Also see PatternLayout.
- */
- LogString sqlStatement;
+ /**
+ * Stores the string given to the pattern layout for conversion into a SQL
+ * statement, eg: insert into LogTable (Thread, File, Message) values
+ * ("%t", "%F", "%m")
+ *
+ * Be careful of quotes in your messages!
+ *
+ * Also see PatternLayout.
+ */
+ LogString sqlStatement;
- /**
- * size of LoggingEvent buffer before writing to the database.
- * Default is 1.
- */
- size_t bufferSize;
+ /**
+ * size of LoggingEvent buffer before writing to the database.
+ * Default is 1.
+ */
+ size_t bufferSize;
- /**
- * ArrayList holding the buffer of Logging Events.
- */
- std::list<spi::LoggingEventPtr> buffer;
+ /**
+ * ArrayList holding the buffer of Logging Events.
+ */
+ std::list<spi::LoggingEventPtr> buffer;
};
}
diff --git a/src/main/include/log4cxx/private/patternconverter_priv.h b/src/main/include/log4cxx/private/patternconverter_priv.h
index b01197b..fedaaaa 100644
--- a/src/main/include/log4cxx/private/patternconverter_priv.h
+++ b/src/main/include/log4cxx/private/patternconverter_priv.h
@@ -28,19 +28,20 @@ namespace pattern
* @param name name for pattern converter.
* @param style CSS style for formatted output.
*/
-struct PatternConverter::PatternConverterPrivate {
- PatternConverterPrivate( const LogString& _name, const LogString& _style ) :
- name(_name),
- style(_style){}
+struct PatternConverter::PatternConverterPrivate
+{
+ PatternConverterPrivate( const LogString& _name, const LogString& _style ) :
+ name(_name),
+ style(_style) {}
- /**
- * Converter name.
- */
- const LogString name;
- /**
- * Converter style name.
- */
- const LogString style;
+ /**
+ * Converter name.
+ */
+ const LogString name;
+ /**
+ * Converter style name.
+ */
+ const LogString style;
};
}
diff --git a/src/main/include/log4cxx/private/socketappenderskeleton_priv.h b/src/main/include/log4cxx/private/socketappenderskeleton_priv.h
index fac4e45..318e5ac 100644
--- a/src/main/include/log4cxx/private/socketappenderskeleton_priv.h
+++ b/src/main/include/log4cxx/private/socketappenderskeleton_priv.h
@@ -26,33 +26,34 @@ namespace log4cxx
namespace net
{
-struct SocketAppenderSkeleton::SocketAppenderSkeletonPriv : public AppenderSkeletonPrivate {
- SocketAppenderSkeletonPriv(int defaultPort, int reconnectionDelay) :
- AppenderSkeletonPrivate(),
- remoteHost(),
- address(),
- port(defaultPort),
- reconnectionDelay(reconnectionDelay),
- locationInfo(false),
- thread(){}
+struct SocketAppenderSkeleton::SocketAppenderSkeletonPriv : public AppenderSkeletonPrivate
+{
+ SocketAppenderSkeletonPriv(int defaultPort, int reconnectionDelay) :
+ AppenderSkeletonPrivate(),
+ remoteHost(),
+ address(),
+ port(defaultPort),
+ reconnectionDelay(reconnectionDelay),
+ locationInfo(false),
+ thread() {}
SocketAppenderSkeletonPriv(helpers::InetAddressPtr address, int defaultPort, int reconnectionDelay) :
- AppenderSkeletonPrivate(),
- remoteHost(),
- address(address),
- port(defaultPort),
- reconnectionDelay(reconnectionDelay),
- locationInfo(false),
- thread(){}
+ AppenderSkeletonPrivate(),
+ remoteHost(),
+ address(address),
+ port(defaultPort),
+ reconnectionDelay(reconnectionDelay),
+ locationInfo(false),
+ thread() {}
SocketAppenderSkeletonPriv(const LogString& host, int port, int delay) :
- AppenderSkeletonPrivate(),
- remoteHost(host),
- address(helpers::InetAddress::getByName(host)),
- port(port),
- reconnectionDelay(delay),
- locationInfo(false),
- thread(){}
+ AppenderSkeletonPrivate(),
+ remoteHost(host),
+ address(helpers::InetAddress::getByName(host)),
+ port(port),
+ reconnectionDelay(delay),
+ locationInfo(false),
+ thread() {}
/**
host name
diff --git a/src/main/include/log4cxx/private/syslogappender_priv.h b/src/main/include/log4cxx/private/syslogappender_priv.h
index 4253bbf..84bfb01 100644
--- a/src/main/include/log4cxx/private/syslogappender_priv.h
+++ b/src/main/include/log4cxx/private/syslogappender_priv.h
@@ -22,69 +22,75 @@
#include <log4cxx/private/log4cxx_private.h>
#if LOG4CXX_HAVE_SYSLOG
- #include <syslog.h>
+ #include <syslog.h>
#else
- /* facility codes */
- #define LOG_KERN (0<<3) /* kernel messages */
- #define LOG_USER (1<<3) /* random user-level messages */
- #define LOG_MAIL (2<<3) /* mail system */
- #define LOG_DAEMON (3<<3) /* system daemons */
- #define LOG_AUTH (4<<3) /* security/authorization messages */
- #define LOG_SYSLOG (5<<3) /* messages generated internally by syslogd */
- #define LOG_LPR (6<<3) /* line printer subsystem */
- #define LOG_NEWS (7<<3) /* network news subsystem */
- #define LOG_UUCP (8<<3) /* UUCP subsystem */
- #define LOG_CRON (9<<3) /* clock daemon */
- #define LOG_AUTHPRIV (10<<3) /* security/authorization messages (private) */
- #define LOG_FTP (11<<3) /* ftp daemon */
+ /* facility codes */
+ #define LOG_KERN (0<<3) /* kernel messages */
+ #define LOG_USER (1<<3) /* random user-level messages */
+ #define LOG_MAIL (2<<3) /* mail system */
+ #define LOG_DAEMON (3<<3) /* system daemons */
+ #define LOG_AUTH (4<<3) /* security/authorization messages */
+ #define LOG_SYSLOG (5<<3) /* messages generated internally by syslogd */
+ #define LOG_LPR (6<<3) /* line printer subsystem */
+ #define LOG_NEWS (7<<3) /* network news subsystem */
+ #define LOG_UUCP (8<<3) /* UUCP subsystem */
+ #define LOG_CRON (9<<3) /* clock daemon */
+ #define LOG_AUTHPRIV (10<<3) /* security/authorization messages (private) */
+ #define LOG_FTP (11<<3) /* ftp daemon */
- /* other codes through 15 reserved for system use */
- #define LOG_LOCAL0 (16<<3) /* reserved for local use */
- #define LOG_LOCAL1 (17<<3) /* reserved for local use */
- #define LOG_LOCAL2 (18<<3) /* reserved for local use */
- #define LOG_LOCAL3 (19<<3) /* reserved for local use */
- #define LOG_LOCAL4 (20<<3) /* reserved for local use */
- #define LOG_LOCAL5 (21<<3) /* reserved for local use */
- #define LOG_LOCAL6 (22<<3) /* reserved for local use */
- #define LOG_LOCAL7 (23<<3) /* reserved for local use */
+ /* other codes through 15 reserved for system use */
+ #define LOG_LOCAL0 (16<<3) /* reserved for local use */
+ #define LOG_LOCAL1 (17<<3) /* reserved for local use */
+ #define LOG_LOCAL2 (18<<3) /* reserved for local use */
+ #define LOG_LOCAL3 (19<<3) /* reserved for local use */
+ #define LOG_LOCAL4 (20<<3) /* reserved for local use */
+ #define LOG_LOCAL5 (21<<3) /* reserved for local use */
+ #define LOG_LOCAL6 (22<<3) /* reserved for local use */
+ #define LOG_LOCAL7 (23<<3) /* reserved for local use */
#endif
-namespace log4cxx{
-namespace net{
+namespace log4cxx
+{
+namespace net
+{
-struct SyslogAppender::SyslogAppenderPriv : public AppenderSkeleton::AppenderSkeletonPrivate{
- SyslogAppenderPriv() :
- AppenderSkeletonPrivate(),
- syslogFacility(LOG_USER),
- facilityPrinting(false),
- maxMessageLength(1024){
+struct SyslogAppender::SyslogAppenderPriv : public AppenderSkeleton::AppenderSkeletonPrivate
+{
+ SyslogAppenderPriv() :
+ AppenderSkeletonPrivate(),
+ syslogFacility(LOG_USER),
+ facilityPrinting(false),
+ maxMessageLength(1024)
+ {
- }
+ }
- SyslogAppenderPriv(const LayoutPtr& layout, int syslogFacility) :
- AppenderSkeletonPrivate (layout),
- syslogFacility(syslogFacility),
- facilityPrinting(false),
- maxMessageLength(1024){
+ SyslogAppenderPriv(const LayoutPtr& layout, int syslogFacility) :
+ AppenderSkeletonPrivate (layout),
+ syslogFacility(syslogFacility),
+ facilityPrinting(false),
+ maxMessageLength(1024)
+ {
- }
+ }
- SyslogAppenderPriv(const LayoutPtr& layout,
- const LogString& syslogHost, int syslogFacility) :
- AppenderSkeletonPrivate(layout),
- syslogFacility(syslogFacility),
- facilityPrinting(false),
- maxMessageLength(1024){
+ SyslogAppenderPriv(const LayoutPtr& layout,
+ const LogString& syslogHost, int syslogFacility) :
+ AppenderSkeletonPrivate(layout),
+ syslogFacility(syslogFacility),
+ facilityPrinting(false),
+ maxMessageLength(1024)
+ {
- }
+ }
- int syslogFacility; // Have LOG_USER as default
- LogString facilityStr;
- bool facilityPrinting;
- std::unique_ptr<helpers::SyslogWriter> sw;
- LogString syslogHost;
- int syslogHostPort;
- int maxMessageLength;
+ int syslogFacility; // Have LOG_USER as default
+ LogString facilityStr;
+ bool facilityPrinting;
+ std::unique_ptr<helpers::SyslogWriter> sw;
+ LogString syslogHost;
+ int syslogHostPort;
+ int maxMessageLength;
};
}
diff --git a/src/main/include/log4cxx/private/writerappender_priv.h b/src/main/include/log4cxx/private/writerappender_priv.h
index e748253..74d00c3 100644
--- a/src/main/include/log4cxx/private/writerappender_priv.h
+++ b/src/main/include/log4cxx/private/writerappender_priv.h
@@ -24,23 +24,27 @@
#ifndef _LOG4CXX_WRITERAPPENDER_PRIV_H
#define _LOG4CXX_WRITERAPPENDER_PRIV_H
-namespace log4cxx{
+namespace log4cxx
+{
-struct WriterAppender::WriterAppenderPriv : public AppenderSkeleton::AppenderSkeletonPrivate {
- WriterAppenderPriv() :
- AppenderSkeletonPrivate(),
- immediateFlush(true){}
+struct WriterAppender::WriterAppenderPriv : public AppenderSkeleton::AppenderSkeletonPrivate
+{
+ WriterAppenderPriv() :
+ AppenderSkeletonPrivate(),
+ immediateFlush(true) {}
WriterAppenderPriv(const LayoutPtr& layout1,
- log4cxx::helpers::WriterPtr& writer1) :
- AppenderSkeletonPrivate(layout1),
- immediateFlush(true),
- writer(writer1){
+ log4cxx::helpers::WriterPtr& writer1) :
+ AppenderSkeletonPrivate(layout1),
+ immediateFlush(true),
+ writer(writer1)
+ {
}
WriterAppenderPriv(const LayoutPtr& layout1) :
- AppenderSkeletonPrivate(layout1),
- immediateFlush(true){
+ AppenderSkeletonPrivate(layout1),
+ immediateFlush(true)
+ {
}
/**
diff --git a/src/main/include/log4cxx/rolling/filerenameaction.h b/src/main/include/log4cxx/rolling/filerenameaction.h
index db80da6..b572bd0 100644
--- a/src/main/include/log4cxx/rolling/filerenameaction.h
+++ b/src/main/include/log4cxx/rolling/filerenameaction.h
@@ -29,7 +29,7 @@ namespace rolling
class FileRenameAction : public Action
{
- struct FileRenameActionPrivate;
+ struct FileRenameActionPrivate;
public:
DECLARE_ABSTRACT_LOG4CXX_OBJECT(FileRenameAction)
BEGIN_LOG4CXX_CAST_MAP()
diff --git a/src/main/include/log4cxx/rolling/rollingfileappender.h b/src/main/include/log4cxx/rolling/rollingfileappender.h
index c683b3f..53a7eee 100644
--- a/src/main/include/log4cxx/rolling/rollingfileappender.h
+++ b/src/main/include/log4cxx/rolling/rollingfileappender.h
@@ -78,13 +78,13 @@ namespace rolling
* */
class LOG4CXX_EXPORT RollingFileAppender : public FileAppender
{
- DECLARE_LOG4CXX_OBJECT(RollingFileAppender)
- BEGIN_LOG4CXX_CAST_MAP()
- LOG4CXX_CAST_ENTRY(RollingFileAppender)
- LOG4CXX_CAST_ENTRY_CHAIN(FileAppender)
- END_LOG4CXX_CAST_MAP()
- protected:
- struct RollingFileAppenderPriv;
+ DECLARE_LOG4CXX_OBJECT(RollingFileAppender)
+ BEGIN_LOG4CXX_CAST_MAP()
+ LOG4CXX_CAST_ENTRY(RollingFileAppender)
+ LOG4CXX_CAST_ENTRY_CHAIN(FileAppender)
+ END_LOG4CXX_CAST_MAP()
+ protected:
+ struct RollingFileAppenderPriv;
public:
RollingFileAppender();
diff --git a/src/main/include/log4cxx/rolling/zipcompressaction.h b/src/main/include/log4cxx/rolling/zipcompressaction.h
index bda9a9f..91762b1 100644
--- a/src/main/include/log4cxx/rolling/zipcompressaction.h
+++ b/src/main/include/log4cxx/rolling/zipcompressaction.h
@@ -35,7 +35,7 @@ namespace rolling
class ZipCompressAction : public Action
{
- struct ZipCompressActionPrivate;
+ struct ZipCompressActionPrivate;
public:
DECLARE_ABSTRACT_LOG4CXX_OBJECT(ZipCompressAction)
BEGIN_LOG4CXX_CAST_MAP()
diff --git a/src/main/include/log4cxx/spi/configurator.h b/src/main/include/log4cxx/spi/configurator.h
index 3108618..144d068 100644
--- a/src/main/include/log4cxx/spi/configurator.h
+++ b/src/main/include/log4cxx/spi/configurator.h
@@ -46,7 +46,7 @@ class LOG4CXX_EXPORT Configurator : virtual public helpers::Object
virtual void doConfigure(const File& configFileName,
spi::LoggerRepositoryPtr repository) = 0;
-protected:
+ protected:
Configurator();
private:
diff --git a/src/main/include/log4cxx/spi/filter.h b/src/main/include/log4cxx/spi/filter.h
index 1f07f36..6130526 100644
--- a/src/main/include/log4cxx/spi/filter.h
+++ b/src/main/include/log4cxx/spi/filter.h
@@ -68,7 +68,7 @@ xml::DOMConfigurator DOMConfigurator}.
class LOG4CXX_EXPORT Filter : public virtual OptionHandler,
public virtual helpers::Object
{
-protected:
+ protected:
struct FilterPrivate;
std::unique_ptr<FilterPrivate> m_priv;
diff --git a/src/main/include/log4cxx/writerappender.h b/src/main/include/log4cxx/writerappender.h
index f8d68a4..e77d75a 100644
--- a/src/main/include/log4cxx/writerappender.h
+++ b/src/main/include/log4cxx/writerappender.h
@@ -41,8 +41,8 @@ WriterAppender appends log events to a standard output stream
*/
class LOG4CXX_EXPORT WriterAppender : public AppenderSkeleton
{
-protected:
- struct WriterAppenderPriv;
+ protected:
+ struct WriterAppenderPriv;
public:
DECLARE_ABSTRACT_LOG4CXX_OBJECT(WriterAppender)
BEGIN_LOG4CXX_CAST_MAP()
diff --git a/src/main/include/log4cxx/xml/domconfigurator.h b/src/main/include/log4cxx/xml/domconfigurator.h
index 09b88c6..0c4d6d1 100644
--- a/src/main/include/log4cxx/xml/domconfigurator.h
+++ b/src/main/include/log4cxx/xml/domconfigurator.h
@@ -70,8 +70,8 @@ class LOG4CXX_EXPORT DOMConfigurator :
virtual public spi::Configurator,
virtual public helpers::Object
{
-public:
- ~DOMConfigurator();
+ public:
+ ~DOMConfigurator();
protected:
typedef std::map<LogString, AppenderPtr> AppenderMap;
diff --git a/src/test/cpp/customlogger/xlogger.cpp b/src/test/cpp/customlogger/xlogger.cpp
index fa7102d..3aaf2bf 100644
--- a/src/test/cpp/customlogger/xlogger.cpp
+++ b/src/test/cpp/customlogger/xlogger.cpp
@@ -33,6 +33,7 @@ XFactoryPtr XLogger::factory = XFactoryPtr(new XFactory());
void XLogger::lethal(const LogString& message, const LocationInfo& locationInfo)
{
log4cxx::spi::LoggerRepositoryPtr rep = getLoggerRepository().lock();
+
if (rep->isDisabled(XLevel::LETHAL_INT))
{
return;
@@ -47,6 +48,7 @@ void XLogger::lethal(const LogString& message, const LocationInfo& locationInfo)
void XLogger::lethal(const LogString& message)
{
log4cxx::spi::LoggerRepositoryPtr rep = getLoggerRepository().lock();
+
if (rep->isDisabled(XLevel::LETHAL_INT))
{
return;
@@ -71,6 +73,7 @@ LoggerPtr XLogger::getLogger(const helpers::Class& clazz)
void XLogger::trace(const LogString& message, const LocationInfo& locationInfo)
{
log4cxx::spi::LoggerRepositoryPtr rep = getLoggerRepository().lock();
+
if (rep->isDisabled(XLevel::TRACE_INT))
{
return;
@@ -85,6 +88,7 @@ void XLogger::trace(const LogString& message, const LocationInfo& locationInfo)
void XLogger::trace(const LogString& message)
{
log4cxx::spi::LoggerRepositoryPtr rep = getLoggerRepository().lock();
+
if (rep->isDisabled(XLevel::TRACE_INT))
{
return;
diff --git a/src/test/cpp/customlogger/xloggertestcase.cpp b/src/test/cpp/customlogger/xloggertestcase.cpp
index 278706f..69a26ff 100644
--- a/src/test/cpp/customlogger/xloggertestcase.cpp
+++ b/src/test/cpp/customlogger/xloggertestcase.cpp
@@ -53,7 +53,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = logger->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/encodingtest.cpp b/src/test/cpp/encodingtest.cpp
index 9379eb3..2b9d334 100644
--- a/src/test/cpp/encodingtest.cpp
+++ b/src/test/cpp/encodingtest.cpp
@@ -59,7 +59,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = Logger::getRootLogger()->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/helpers/casttestcase.cpp b/src/test/cpp/helpers/casttestcase.cpp
index 8c66782..7cd1874 100644
--- a/src/test/cpp/helpers/casttestcase.cpp
+++ b/src/test/cpp/helpers/casttestcase.cpp
@@ -60,7 +60,8 @@ public:
LOGUNIT_ASSERT(!fos);
}
- void testRollingFileAppender(){
+ void testRollingFileAppender()
+ {
rolling::RollingFileAppenderPtr rolling = rolling::RollingFileAppenderPtr(new rolling::RollingFileAppender());
AppenderPtr appender = log4cxx::cast<Appender>(rolling);
diff --git a/src/test/cpp/helpers/threadutilitytestcase.cpp b/src/test/cpp/helpers/threadutilitytestcase.cpp
index 05b7cfd..dcd718c 100644
--- a/src/test/cpp/helpers/threadutilitytestcase.cpp
+++ b/src/test/cpp/helpers/threadutilitytestcase.cpp
@@ -31,37 +31,42 @@ LOGUNIT_CLASS(ThreadUtilityTest)
LOGUNIT_TEST_SUITE_END();
public:
- void testNullFunctions(){
+ void testNullFunctions()
+ {
ThreadUtilityPtr thrUtil = ThreadUtility::instance();
thrUtil->configureFuncs( nullptr, nullptr, nullptr );
- std::thread t = thrUtil->createThread( LOG4CXX_STR("FooName"), [](){} );
+ std::thread t = thrUtil->createThread( LOG4CXX_STR("FooName"), []() {} );
t.join();
}
- void testCustomFunctions(){
+ void testCustomFunctions()
+ {
ThreadUtilityPtr thrUtil = ThreadUtility::instance();
int num_pre = 0;
int num_started = 0;
int num_post = 0;
thrUtil->configureFuncs(
- [&num_pre](){
- num_pre++;
- },
- [&num_started]( LogString,
- std::thread::id,
- std::thread::native_handle_type ){
- num_started++;
- },
- [&num_post](){
- num_post++;
- }
+ [&num_pre]()
+ {
+ num_pre++;
+ },
+ [&num_started]( LogString,
+ std::thread::id,
+ std::thread::native_handle_type )
+ {
+ num_started++;
+ },
+ [&num_post]()
+ {
+ num_post++;
+ }
);
- std::thread t = thrUtil->createThread( LOG4CXX_STR("FooName"), [](){} );
+ std::thread t = thrUtil->createThread( LOG4CXX_STR("FooName"), []() {} );
t.join();
@@ -70,12 +75,13 @@ public:
LOGUNIT_ASSERT_EQUAL( num_post, 1 );
}
- void testDefaultFunctions(){
+ void testDefaultFunctions()
+ {
ThreadUtility::configure( ThreadConfigurationType::BlockSignalsAndNameThread );
ThreadUtilityPtr thrUtil = ThreadUtility::instance();
- std::thread t = thrUtil->createThread( LOG4CXX_STR("FooName"), [](){} );
+ std::thread t = thrUtil->createThread( LOG4CXX_STR("FooName"), []() {} );
t.join();
}
diff --git a/src/test/cpp/hierarchythresholdtestcase.cpp b/src/test/cpp/hierarchythresholdtestcase.cpp
index d1b2759..e1a7a51 100644
--- a/src/test/cpp/hierarchythresholdtestcase.cpp
+++ b/src/test/cpp/hierarchythresholdtestcase.cpp
@@ -50,7 +50,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = logger->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/l7dtestcase.cpp b/src/test/cpp/l7dtestcase.cpp
index e1b855b..44a3df5 100644
--- a/src/test/cpp/l7dtestcase.cpp
+++ b/src/test/cpp/l7dtestcase.cpp
@@ -68,7 +68,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = root->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/mdctestcase.cpp b/src/test/cpp/mdctestcase.cpp
index 86b147f..e05383b 100644
--- a/src/test/cpp/mdctestcase.cpp
+++ b/src/test/cpp/mdctestcase.cpp
@@ -43,7 +43,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = Logger::getRootLogger()->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/minimumtestcase.cpp b/src/test/cpp/minimumtestcase.cpp
index 4bb087d..c439a15 100644
--- a/src/test/cpp/minimumtestcase.cpp
+++ b/src/test/cpp/minimumtestcase.cpp
@@ -54,7 +54,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = root->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/multithreadtest.cpp b/src/test/cpp/multithreadtest.cpp
index e5ac7c7..136420b 100644
--- a/src/test/cpp/multithreadtest.cpp
+++ b/src/test/cpp/multithreadtest.cpp
@@ -29,22 +29,26 @@ using log4cxx::Logger;
using log4cxx::LoggerPtr;
using log4cxx::LogManager;
-class NullWriterAppender : public log4cxx::AppenderSkeleton{
-public:
- NullWriterAppender(){}
+class NullWriterAppender : public log4cxx::AppenderSkeleton
+{
+ public:
+ NullWriterAppender() {}
- virtual void close(){}
+ virtual void close() {}
- virtual bool requiresLayout() const {
- return false;
- }
+ virtual bool requiresLayout() const
+ {
+ return false;
+ }
- virtual void append(const log4cxx::spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p){
- // Do nothing but discard the data
- }
+ virtual void append(const log4cxx::spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p)
+ {
+ // Do nothing but discard the data
+ }
};
-static void multithread_logger( int times ){
+static void multithread_logger( int times )
+{
/*
* An explanation on this test: according to LOGCXX-322, calling
* exit(0) (or equivalent) from a secondary thread causes a segfault.
@@ -61,15 +65,19 @@ static void multithread_logger( int times ){
std::mt19937 gen(rd());
std::uniform_int_distribution<> distribution( 100, times );
- for( int x = 0; x < times; x++ ){
+ for ( int x = 0; x < times; x++ )
+ {
LOG4CXX_INFO( logger, "This is a test message that has some data" );
- if( distribution(gen) == x ){
+
+ if ( distribution(gen) == x )
+ {
std::exit(0);
}
}
}
-LOGUNIT_CLASS(MultithreadTest){
+LOGUNIT_CLASS(MultithreadTest)
+{
LOGUNIT_TEST_SUITE(MultithreadTest);
LOGUNIT_TEST(testMultithreadedLoggers);
LOGUNIT_TEST_SUITE_END();
@@ -84,19 +92,23 @@ public:
void tearDown()
{
-// root->getLoggerRepository()->resetConfiguration();
+ // root->getLoggerRepository()->resetConfiguration();
}
- void testMultithreadedLoggers(){
+ void testMultithreadedLoggers()
+ {
std::vector<std::thread> threads;
- for( int x = 0; x < 6; x++ ){
+ for ( int x = 0; x < 6; x++ )
+ {
std::thread thr( multithread_logger, 20000 );
threads.push_back( std::move(thr) );
}
- for( std::thread& thr : threads ){
- if( thr.joinable() ){
+ for ( std::thread& thr : threads )
+ {
+ if ( thr.joinable() )
+ {
thr.join();
}
}
diff --git a/src/test/cpp/ndctestcase.cpp b/src/test/cpp/ndctestcase.cpp
index f0ab889..72a9970 100644
--- a/src/test/cpp/ndctestcase.cpp
+++ b/src/test/cpp/ndctestcase.cpp
@@ -48,7 +48,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = logger->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/net/telnetappendertestcase.cpp b/src/test/cpp/net/telnetappendertestcase.cpp
index 989b981..0ca1caf 100644
--- a/src/test/cpp/net/telnetappendertestcase.cpp
+++ b/src/test/cpp/net/telnetappendertestcase.cpp
@@ -45,7 +45,8 @@ class TelnetAppenderTestCase : public AppenderSkeletonTestCase
enum { TEST_PORT = 1723 };
- static LayoutPtr createLayout(){
+ static LayoutPtr createLayout()
+ {
PatternLayoutPtr pl = std::make_shared<PatternLayout>();
pl->setConversionPattern( "%r [%t] %-5p - %m%n" );
return pl;
diff --git a/src/test/cpp/patternlayouttest.cpp b/src/test/cpp/patternlayouttest.cpp
index 1f64feb..f290ce1 100644
--- a/src/test/cpp/patternlayouttest.cpp
+++ b/src/test/cpp/patternlayouttest.cpp
@@ -95,7 +95,11 @@ public:
{
MDC::clear();
log4cxx::spi::LoggerRepositoryPtr rep = root->getLoggerRepository().lock();
- if (rep) rep->resetConfiguration();
+
+ if (rep)
+ {
+ rep->resetConfiguration();
+ }
}
void test1()
diff --git a/src/test/cpp/varia/errorhandlertestcase.cpp b/src/test/cpp/varia/errorhandlertestcase.cpp
index f96e1d3..b972bc0 100644
--- a/src/test/cpp/varia/errorhandlertestcase.cpp
+++ b/src/test/cpp/varia/errorhandlertestcase.cpp
@@ -51,7 +51,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = logger->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/varia/levelmatchfiltertestcase.cpp b/src/test/cpp/varia/levelmatchfiltertestcase.cpp
index 94d676d..083580b 100644
--- a/src/test/cpp/varia/levelmatchfiltertestcase.cpp
+++ b/src/test/cpp/varia/levelmatchfiltertestcase.cpp
@@ -57,7 +57,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = root->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/varia/levelrangefiltertestcase.cpp b/src/test/cpp/varia/levelrangefiltertestcase.cpp
index 4b4f9b9..6a3c95e 100644
--- a/src/test/cpp/varia/levelrangefiltertestcase.cpp
+++ b/src/test/cpp/varia/levelrangefiltertestcase.cpp
@@ -57,7 +57,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = root->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/xml/domtestcase.cpp b/src/test/cpp/xml/domtestcase.cpp
index 0d12181..fce5874 100644
--- a/src/test/cpp/xml/domtestcase.cpp
+++ b/src/test/cpp/xml/domtestcase.cpp
@@ -77,7 +77,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = root->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
diff --git a/src/test/cpp/xml/xmllayouttestcase.cpp b/src/test/cpp/xml/xmllayouttestcase.cpp
index bed2d86..4311e97 100644
--- a/src/test/cpp/xml/xmllayouttestcase.cpp
+++ b/src/test/cpp/xml/xmllayouttestcase.cpp
@@ -83,7 +83,9 @@ public:
void tearDown()
{
log4cxx::spi::LoggerRepositoryPtr rep = logger->getLoggerRepository().lock();
- if (rep) {
+
+ if (rep)
+ {
rep->resetConfiguration();
}
}
[logging-log4cxx] 01/02: add destructor for HTMLLayout
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch LOGCXX-510
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 8b4c5dd73dc3c4cc1e4e85e5e7bd6f79fdbe02fb
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Fri Nov 5 21:41:11 2021 -0400
add destructor for HTMLLayout
---
src/main/cpp/htmllayout.cpp | 2 ++
src/main/include/log4cxx/htmllayout.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/src/main/cpp/htmllayout.cpp b/src/main/cpp/htmllayout.cpp
index 32e8596..60930fa 100644
--- a/src/main/cpp/htmllayout.cpp
+++ b/src/main/cpp/htmllayout.cpp
@@ -54,6 +54,8 @@ HTMLLayout::HTMLLayout()
m_priv->dateFormat.setTimeZone(TimeZone::getGMT());
}
+HTMLLayout::~HTMLLayout(){}
+
void HTMLLayout::setOption(const LogString& option,
const LogString& value)
diff --git a/src/main/include/log4cxx/htmllayout.h b/src/main/include/log4cxx/htmllayout.h
index e7d8ac1..c0bf1ac 100644
--- a/src/main/include/log4cxx/htmllayout.h
+++ b/src/main/include/log4cxx/htmllayout.h
@@ -48,6 +48,7 @@ class LOG4CXX_EXPORT HTMLLayout : public Layout
END_LOG4CXX_CAST_MAP()
HTMLLayout();
+ ~HTMLLayout();
/**
The <b>LocationInfo</b> option takes a boolean value. By