You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by sw...@apache.org on 2022/11/01 21:41:20 UTC
[logging-log4cxx] branch next_stable updated (22be6885 -> 3e3d042f)
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a change to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
from 22be6885 Restore documented RollingFileAppender configuration properties (#146)
add bbe2b800 Merge branch 'next_wchar_throughputtests' into next_stable
add 624be6e9 Merge branch 'apache:next_stable' into next_stable
add aba95058 Merge remote-tracking branch 'swebb-fork/next_stable' into next_stable
add b6b697eb Merge remote-tracking branch 'origin/next_stable' into next_stable
add 5c06f296 Merge branch 'next_stable' of https://github.com/apache/logging-log4cxx into next_stable
add ac697a3a Merge branch 'next_stable' of https://github.com/apache/logging-log4cxx into next_stable
add deda5a6e Merge branch 'next_stable' of https://github.com/apache/logging-log4cxx into next_stable
add cb5d2d34 Merge branch 'next_stable' of https://github.com/apache/logging-log4cxx into next_stable
add 3308847b Merge branch 'next_stable' of https://github.com/apache/logging-log4cxx into next_stable
add c00c08c2 Merge branch 'next_stable' of https://github.com/apache/logging-log4cxx into next_stable
new ef0feede Merge branch 'next_stable' of https://github.com/apache/logging-log4cxx into next_stable
add 5109466a Prevent compilation errors when logchar is unichar (#142)
add f5341b38 Add the cmake build options APR_STATIC and APU_STATIC to the cmake user interface
add d117f0be LOGCXX-562 (#144)
add a7bb076c Enable issues to allow github users to create issues
new 3e3d042f Merge branch 'master' into next_stable
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:
.asf.yaml | 2 +
.../{abi-compatibility.yml => log4cxx-cpp11.yml} | 37 ++-----
.github/workflows/log4cxx-posix.yml | 86 +++++++++++++++
.github/workflows/log4cxx-windows-static.yml | 87 +++++++++++++++
.github/workflows/log4cxx-windows.yml | 86 +++++++++++++++
.github/workflows/log4cxx.yml | 119 ---------------------
CMakeLists.txt | 2 +
src/examples/cpp/CMakeLists.txt | 2 +-
src/main/cpp/logstream.cpp | 5 +
src/main/cpp/messagebuffer.cpp | 5 +
src/main/cpp/ndc.cpp | 4 +-
src/main/cpp/threadutility.cpp | 15 ++-
src/main/cpp/transcoder.cpp | 4 +-
src/main/include/CMakeLists.txt | 9 ++
src/test/cpp/pattern/patternparsertestcase.cpp | 6 +-
src/test/cpp/rolling/manualrollingtest.cpp | 7 +-
src/test/cpp/rolling/timebasedrollingtest.cpp | 37 +++----
src/test/cpp/streamtestcase.cpp | 12 ++-
18 files changed, 336 insertions(+), 189 deletions(-)
copy .github/workflows/{abi-compatibility.yml => log4cxx-cpp11.yml} (56%)
create mode 100644 .github/workflows/log4cxx-posix.yml
create mode 100644 .github/workflows/log4cxx-windows-static.yml
create mode 100644 .github/workflows/log4cxx-windows.yml
delete mode 100644 .github/workflows/log4cxx.yml
[logging-log4cxx] 01/02: Merge branch 'next_stable' of https://github.com/apache/logging-log4cxx into next_stable
Posted by sw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit ef0feede0ef1505044c118c08927771afea114b4
Merge: c00c08c2 22be6885
Author: Stephen Webb <st...@sabreautonomous.com.au>
AuthorDate: Tue Nov 1 09:12:18 2022 +1100
Merge branch 'next_stable' of https://github.com/apache/logging-log4cxx into next_stable
src/main/cpp/fixedwindowrollingpolicy.cpp | 8 +-
src/main/cpp/propertyconfigurator.cpp | 14 +-
src/main/cpp/rollingfileappender.cpp | 133 ++++++++++++++-
.../include/log4cxx/rolling/rollingfileappender.h | 42 ++++-
.../rolling/rollingfileappenderpropertiestest.cpp | 185 ++++++++++++++++++++-
.../input/rolling/obsoleteRFA1.properties | 1 +
6 files changed, 365 insertions(+), 18 deletions(-)
[logging-log4cxx] 02/02: Merge branch 'master' into next_stable
Posted by sw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 3e3d042f43d70be1f845640b6c1dfe906e9c7127
Merge: ef0feede a7bb076c
Author: Stephen Webb <st...@sabreautonomous.com.au>
AuthorDate: Wed Nov 2 08:41:03 2022 +1100
Merge branch 'master' into next_stable
.asf.yaml | 2 +
.asf.yaml => .github/workflows/log4cxx-cpp11.yml | 41 ++++++--
.github/workflows/log4cxx-posix.yml | 86 ++++++++++++++++
.github/workflows/log4cxx-windows-static.yml | 87 +++++++++++++++++
.github/workflows/log4cxx-windows.yml | 86 ++++++++++++++++
.github/workflows/log4cxx.yml | 119 -----------------------
CMakeLists.txt | 2 +
src/examples/cpp/CMakeLists.txt | 2 +-
src/main/cpp/logstream.cpp | 5 +
src/main/cpp/messagebuffer.cpp | 5 +
src/main/cpp/ndc.cpp | 4 +-
src/main/cpp/threadutility.cpp | 15 ++-
src/main/cpp/transcoder.cpp | 4 +-
src/main/include/CMakeLists.txt | 9 ++
src/test/cpp/pattern/patternparsertestcase.cpp | 6 +-
src/test/cpp/rolling/manualrollingtest.cpp | 7 +-
src/test/cpp/rolling/timebasedrollingtest.cpp | 37 ++++---
src/test/cpp/streamtestcase.cpp | 12 ++-
18 files changed, 357 insertions(+), 172 deletions(-)
diff --cc src/main/cpp/threadutility.cpp
index 543281df,057ecd86..c311bba6
--- a/src/main/cpp/threadutility.cpp
+++ b/src/main/cpp/threadutility.cpp
@@@ -131,24 -113,19 +131,21 @@@ void ThreadUtility::preThreadBlockSigna
}
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 )
- {
- LOGLOG_ERROR( LOG4CXX_STR("unable to set thread name") );
+ LOG4CXX_ENCODE_CHAR(sthreadName, threadName);
+ if (pthread_setname_np(static_cast<pthread_t>(nativeHandle), sthreadName.c_str()) < 0) {
+ LOGLOG_ERROR(LOG4CXX_STR("unable to set thread name"));
}
-#elif LOG4CXX_HAS_SETTHREADDESCRIPTION
+
- #elif LOG4CXX_HAS_SETTHREADDESCRIPTION
- HRESULT hr = SetThreadDescription(static_cast<HANDLE>(nativeHandle), threadName.c_str());
-
- if (FAILED(hr))
- {
+ LOG4CXX_ENCODE_WCHAR(wthreadName, threadName);
+ HRESULT hr = SetThreadDescription(static_cast<HANDLE>(nativeHandle), wthreadName.c_str());
+ if(FAILED(hr)){
LOGLOG_ERROR( LOG4CXX_STR("unable to set thread name") );
}
+
#endif
}