You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by zh...@apache.org on 2017/12/22 13:49:03 UTC
[incubator-skywalking] branch fix/log-file-bug updated (375abe9 ->
59371b1)
This is an automated email from the ASF dual-hosted git repository.
zhangxin pushed a change to branch fix/log-file-bug
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 375abe9 Make sure the log config works.
add 678f300 Support to set consume cycle. And invoke the existed callbacks when the message blocked at first time.
add 3cf0a59 Merge pull request #695 from apache/feature/data-carrier
new 59371b1 Merge branch 'master' into fix/log-file-bug
The 1 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:
.../commons/datacarrier/BlockingDataCarrier.java} | 30 ++++-------
.../apm/commons/datacarrier/DataCarrier.java | 59 +++++++++++++++-------
.../apm/commons/datacarrier/buffer/Buffer.java | 16 +++++-
.../apm/commons/datacarrier/buffer/Channels.java | 15 +++---
.../callback/QueueBlockingCallback.java | 11 ++--
.../commons/datacarrier/consumer/ConsumerPool.java | 13 ++---
.../datacarrier/consumer/ConsumerThread.java | 6 ++-
.../datacarrier/consumer/ConsumerPoolTest.java | 4 +-
8 files changed, 90 insertions(+), 64 deletions(-)
copy apm-commons/apm-datacarrier/src/{test/java/org/apache/skywalking/apm/commons/datacarrier/SampleData.java => main/java/org/apache/skywalking/apm/commons/datacarrier/BlockingDataCarrier.java} (66%)
copy apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/UnexpectedException.java => apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/callback/QueueBlockingCallback.java (79%)
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].
[incubator-skywalking] 01/01: Merge branch 'master' into
fix/log-file-bug
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangxin pushed a commit to branch fix/log-file-bug
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 59371b1ff5c973cc732e3b213b0a225106150b05
Merge: 375abe9 3cf0a59
Author: Xin,Zhang <zh...@apache.org>
AuthorDate: Fri Dec 22 21:49:00 2017 +0800
Merge branch 'master' into fix/log-file-bug
.../commons/datacarrier/BlockingDataCarrier.java | 37 ++++++++++++++
.../apm/commons/datacarrier/DataCarrier.java | 59 +++++++++++++++-------
.../apm/commons/datacarrier/buffer/Buffer.java | 16 +++++-
.../apm/commons/datacarrier/buffer/Channels.java | 15 +++---
.../callback/QueueBlockingCallback.java | 28 ++++++++++
.../commons/datacarrier/consumer/ConsumerPool.java | 13 ++---
.../datacarrier/consumer/ConsumerThread.java | 6 ++-
.../datacarrier/consumer/ConsumerPoolTest.java | 4 +-
8 files changed, 140 insertions(+), 38 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.