You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2018/08/29 15:02:24 UTC

[1/2] logging-log4cxx git commit: Before closing process events already present in queue

Repository: logging-log4cxx
Updated Branches:
  refs/heads/LOGCXX-500 98141e50d -> 285f36f69


Before closing process events already present in queue


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/a4869173
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/a4869173
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/a4869173

Branch: refs/heads/LOGCXX-500
Commit: a48691731b7f36f9909df55e7fc8e401554bb049
Parents: 98141e5
Author: Denys Smolianiuk <de...@harmonicinc.com>
Authored: Wed Aug 29 16:49:10 2018 +0300
Committer: Denys Smolianiuk <de...@harmonicinc.com>
Committed: Wed Aug 29 16:49:10 2018 +0300

----------------------------------------------------------------------
 src/main/cpp/asyncappender_nonblocking.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/a4869173/src/main/cpp/asyncappender_nonblocking.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/asyncappender_nonblocking.cpp b/src/main/cpp/asyncappender_nonblocking.cpp
index b6cedfa..25ad7ff 100644
--- a/src/main/cpp/asyncappender_nonblocking.cpp
+++ b/src/main/cpp/asyncappender_nonblocking.cpp
@@ -340,7 +340,7 @@ AsyncAppender::DiscardSummary::createEvent(::log4cxx::helpers::Pool& p,
 void* LOG4CXX_THREAD_FUNC AsyncAppender::dispatch(apr_thread_t* /*thread*/, void* data) {
     AsyncAppender* pThis = (AsyncAppender*) data;
     try {
-        while (!pThis->closed) {
+        while (!pThis->closed || !pThis->buffer.empty()) {
 
              pThis->bufferNotEmpty.await();
 


[2/2] logging-log4cxx git commit: Increase number of events in unit-test as it is not possible to descrease capacity of boost atomic queue

Posted by ts...@apache.org.
Increase number of events in unit-test as it is not possible to descrease capacity of boost atomic queue


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/285f36f6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/285f36f6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/285f36f6

Branch: refs/heads/LOGCXX-500
Commit: 285f36f698c37a27d1caed36b941cb041a3080ee
Parents: a486917
Author: Denys Smolianiuk <de...@harmonicinc.com>
Authored: Wed Aug 29 16:50:28 2018 +0300
Committer: Denys Smolianiuk <de...@harmonicinc.com>
Committed: Wed Aug 29 16:50:28 2018 +0300

----------------------------------------------------------------------
 src/test/cpp/asyncappendertestcase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/285f36f6/src/test/cpp/asyncappendertestcase.cpp
----------------------------------------------------------------------
diff --git a/src/test/cpp/asyncappendertestcase.cpp b/src/test/cpp/asyncappendertestcase.cpp
index 06e58e9..61853d4 100644
--- a/src/test/cpp/asyncappendertestcase.cpp
+++ b/src/test/cpp/asyncappendertestcase.cpp
@@ -236,7 +236,7 @@ public:
         rootLogger->addAppender(async);
         {
             synchronized sync(blockableAppender->getBlocker());
-            for (int i = 0; i < 100; i++) {
+            for (int i = 0; i < 140; i++) {
                    LOG4CXX_INFO(rootLogger, "Hello, World");
                    Thread::sleep(1);
             }