You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/12/25 07:09:02 UTC
[servicecomb-pack] 01/01: SCB-1090 Unified the logger output of the
Omega transports.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-1090
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit bace59061c331da89aac63cf663e7c0edaa6ce7c
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Tue Dec 25 15:08:31 2018 +0800
SCB-1090 Unified the logger output of the Omega transports.
---
.../pack/omega/transport/dubbo/SagaDubboConsumerFilter.java | 4 +++-
.../pack/omega/transport/dubbo/SagaDubboProviderFilter.java | 6 +++---
.../pack/omega/transport/feign/FeignClientRequestInterceptor.java | 2 ++
.../resttemplate/TransactionClientHttpRequestInterceptor.java | 2 ++
.../omega/transport/resttemplate/TransactionHandlerInterceptor.java | 4 +++-
.../pack/omega/transport/servicecomb/SagaConsumerHandler.java | 2 +-
.../pack/omega/transport/servicecomb/SagaProviderHandler.java | 5 ++---
7 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java
index 2a44a46..6261cc5 100644
--- a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java
+++ b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java
@@ -56,8 +56,10 @@ public class SagaDubboConsumerFilter implements Filter {
invocation.getAttachments().put(LOCAL_TX_ID_KEY, omegaContext.localTxId());
}
if (omegaContext != null && omegaContext.globalTxId() != null) {
- LOG.info("Added {} {} and {} {} to dubbo invocation", new Object[] {GLOBAL_TX_ID_KEY, omegaContext.globalTxId(),
+ LOG.debug("Added {} {} and {} {} to dubbo invocation", new Object[] {GLOBAL_TX_ID_KEY, omegaContext.globalTxId(),
LOCAL_TX_ID_KEY, omegaContext.localTxId()});
+ } else {
+ LOG.debug("Cannot inject transaction ID, as the OmegaContext is null or cannot get the globalTxId.");
}
if (invoker != null) {
diff --git a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java
index ee6c905..3a03b15 100644
--- a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java
+++ b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java
@@ -51,17 +51,17 @@ public class SagaDubboProviderFilter implements Filter {
if (omegaContext != null) {
String globalTxId = invocation.getAttachment(GLOBAL_TX_ID_KEY);
if (globalTxId == null) {
- LOG.info("no such omega context global id: {}", GLOBAL_TX_ID_KEY);
+ LOG.debug("Cannot inject transaction ID, no such omega context global id: {}", GLOBAL_TX_ID_KEY);
} else {
omegaContext.setGlobalTxId(globalTxId);
omegaContext.setLocalTxId(invocation.getAttachment(LOCAL_TX_ID_KEY));
- LOG.info("Added {} {} and {} {} to omegaContext", new Object[] {GLOBAL_TX_ID_KEY, omegaContext.globalTxId(),
+ LOG.debug("Added {} {} and {} {} to omegaContext", new Object[] {GLOBAL_TX_ID_KEY, omegaContext.globalTxId(),
LOCAL_TX_ID_KEY, omegaContext.localTxId()});
}
invocation.getAttachments().put(GLOBAL_TX_ID_KEY, null);
invocation.getAttachments().put(LOCAL_TX_ID_KEY, null);
} else {
- LOG.debug("Cannot find omegaContext");
+ LOG.debug("Cannot inject transaction ID, as the OmegaContext is null.");
}
if (invoker != null) {
diff --git a/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignClientRequestInterceptor.java b/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignClientRequestInterceptor.java
index 774b05d..0123e57 100644
--- a/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignClientRequestInterceptor.java
+++ b/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignClientRequestInterceptor.java
@@ -52,6 +52,8 @@ public class FeignClientRequestInterceptor implements RequestInterceptor {
omegaContext.globalTxId(),
LOCAL_TX_ID_KEY,
omegaContext.localTxId());
+ } else {
+ LOG.debug("Cannot inject transaction ID, as the OmegaContext is null or cannot get the globalTxId.");
}
}
}
diff --git a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java
index 0562ad7..5ad63db 100644
--- a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java
+++ b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java
@@ -53,6 +53,8 @@ class TransactionClientHttpRequestInterceptor implements ClientHttpRequestInterc
omegaContext.globalTxId(),
LOCAL_TX_ID_KEY,
omegaContext.localTxId());
+ } else {
+ LOG.debug("Cannot inject transaction ID, as the OmegaContext is null or cannot get the globalTxId.");
}
return execution.execute(request, body);
}
diff --git a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptor.java b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptor.java
index d4aa4ad..d80b0b3 100644
--- a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptor.java
+++ b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptor.java
@@ -49,11 +49,13 @@ class TransactionHandlerInterceptor implements HandlerInterceptor {
if (omegaContext != null) {
String globalTxId = request.getHeader(GLOBAL_TX_ID_KEY);
if (globalTxId == null) {
- LOG.debug("no such header: {}", GLOBAL_TX_ID_KEY);
+ LOG.debug("Cannot inject transaction ID, no such header: {}", GLOBAL_TX_ID_KEY);
} else {
omegaContext.setGlobalTxId(globalTxId);
omegaContext.setLocalTxId(request.getHeader(LOCAL_TX_ID_KEY));
}
+ } else {
+ LOG.debug("Cannot inject transaction ID, as the OmegaContext is null.");
}
return true;
}
diff --git a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandler.java b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandler.java
index 5a51a27..2549244 100644
--- a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandler.java
+++ b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandler.java
@@ -62,7 +62,7 @@ public class SagaConsumerHandler implements Handler {
LOCAL_TX_ID_KEY,
omegaContext.localTxId());
} else {
- LOG.info("Cannot inject transaction ID, as the OmegaContext is null or cannot get the globalTxId.");
+ LOG.debug("Cannot inject transaction ID, as the OmegaContext is null or cannot get the globalTxId.");
}
invocation.next(asyncResponse);
diff --git a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandler.java b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandler.java
index e79d9e4..75dcb0e 100644
--- a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandler.java
+++ b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandler.java
@@ -55,14 +55,13 @@ public class SagaProviderHandler implements Handler {
if (omegaContext != null) {
String globalTxId = invocation.getContext().get(GLOBAL_TX_ID_KEY);
if (globalTxId == null) {
- LOG.debug("no such header: {}", GLOBAL_TX_ID_KEY);
+ LOG.debug("Cannot inject transaction ID, no such header: {}", GLOBAL_TX_ID_KEY);
} else {
-
omegaContext.setGlobalTxId(globalTxId);
omegaContext.setLocalTxId(invocation.getContext().get(LOCAL_TX_ID_KEY));
}
} else {
- LOG.info("Cannot inject transaction ID, as the OmegaContext is null or cannot get the globalTxId.");
+ LOG.debug("Cannot inject transaction ID, as the OmegaContext is null.");
}
invocation.next(asyncResponse);