resolve

apache · Jan 16, 2024 · df92b6f · df92b6f
2 parents 24dab1a + da6c96f
commit df92b6f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java
@@ -397,7 +397,6 @@ private void injectHttpRequestHeader(final ChannelHandlerContext ctx, final Http
 
         private void processHttpCommandRequest(final ChannelHandlerContext ctx, final AsyncContext<HttpCommand> asyncContext) {
             final HttpCommand request = asyncContext.getRequest();
-
             final HttpRequestProcessor choosed = httpRequestProcessorTable.get(request.getRequestCode());
             Runnable runnable = () -> {
                 try {
@@ -426,6 +425,7 @@ private void processHttpCommandRequest(final ChannelHandlerContext ctx, final As
                     if (!asyncContext.isComplete()) {
                         return;
                     }
+
                     log.debug("{}", asyncContext.getResponse());
                     metrics.getSummaryMetrics()
                         .recordHTTPReqResTimeCost(System.currentTimeMillis() - request.getReqTime());

diff --git a/...apache/eventmesh/runtime/core/protocol/http/processor/LocalUnSubscribeEventProcessor.java b/...apache/eventmesh/runtime/core/protocol/http/processor/LocalUnSubscribeEventProcessor.java
@@ -194,6 +194,7 @@ public void handler(final HandlerService.HandlerSpecific handlerSpecific, final
                 } catch (Exception e) {
                     log.error("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms"
                         + "|topic={}|url={}", System.currentTimeMillis() - startTime, JsonUtils.toJSONString(unSubTopicList), unSubscribeUrl, e);
+
                     handlerSpecific.sendErrorResponse(EventMeshRetCode.EVENTMESH_UNSUBSCRIBE_ERR, responseHeaderMap,
                         responseBodyMap, null);
                 }
@@ -213,6 +214,7 @@ public void handler(final HandlerService.HandlerSpecific handlerSpecific, final
                     eventMeshHTTPServer.getSubscriptionManager().getLocalConsumerGroupMapping().keySet()
                         .removeIf(s -> StringUtils.equals(consumerGroup, s));
                 } catch (Exception e) {
+
                     log.error("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms"
                         + "|topic={}|url={}", System.currentTimeMillis() - startTime, JsonUtils.toJSONString(unSubTopicList), unSubscribeUrl, e);
 

diff --git a/...a/org/apache/eventmesh/runtime/core/protocol/http/processor/SendSyncMessageProcessor.java b/...a/org/apache/eventmesh/runtime/core/protocol/http/processor/SendSyncMessageProcessor.java
@@ -215,7 +215,7 @@ public void processRequest(final ChannelHandlerContext ctx, final AsyncContext<H
 
                 @Override
                 public void onSuccess(final CloudEvent event) {
- 
+
                     log.info("message|mq2eventMesh|RSP|SYNC|rrCost={}ms|topic={}"
                         + "|bizSeqNo={}|uniqueId={}", System.currentTimeMillis() - startTime, topic, bizNo, uniqueId);
 
@@ -263,15 +263,10 @@ public void onException(final Throwable e) {
                     asyncContext.onComplete(err, handler);
 
                     eventMeshHTTPServer.getHttpRetryer().newTimeout(sendMessageContext, 10, TimeUnit.SECONDS);
-<<<<<<<HEAD
+
                     log.error("message|mq2eventMesh|RSP|SYNC|rrCost={}ms|topic={}"
                         + "|bizSeqNo={}|uniqueId={}", System.currentTimeMillis() - startTime, topic, bizNo, uniqueId, e);
-=======
-                    LogUtils.error(log, "message|mq2eventMesh|RSP|SYNC|rrCost={}ms|topic={}"
-                            + "|bizSeqNo={}|uniqueId={}",
-                        System.currentTimeMillis() - startTime,
-                        topic, bizNo, uniqueId, e);
->>>>>>>da6c96f3f...fix code style
+
                 }
             }, Integer.parseInt(ttl));
         } catch (Exception ex) {

diff --git a/...in/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SubscribeProcessor.java b/...in/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SubscribeProcessor.java
@@ -186,6 +186,7 @@ public void processRequest(final ChannelHandlerContext ctx, final AsyncContext<H
                     EventMeshRetCode.EVENTMESH_SUBSCRIBE_ERR.getErrMsg() + EventMeshUtil.stackTrace(e, 2),
                     SubscribeResponseBody.class);
                 final long endTime = System.currentTimeMillis();
+
                 log.error("message|eventMesh2mq|REQ|ASYNC|send2MQCost={}ms|topic={}|bizSeqNo={}|uniqueId={}",
                     endTime - startTime, JsonUtils.toJSONString(subscribeRequestBody.getTopics()), subscribeRequestBody.getUrl(), e);
 

diff --git a/.../java/org/apache/eventmesh/runtime/core/protocol/http/processor/UnSubscribeProcessor.java b/.../java/org/apache/eventmesh/runtime/core/protocol/http/processor/UnSubscribeProcessor.java
@@ -218,9 +218,9 @@ public Executor executor() {
         return eventMeshHTTPServer.getHttpThreadPoolGroup().getClientManageExecutor();
     }
 
+
     private void registerClient(final UnSubscribeRequestHeader unSubscribeRequestHeader, final String consumerGroup,
-        final List<String> topicList,
-        final String url) {
+        final List<String> topicList, final String url) {
         for (final String topic : topicList) {
             final Client client = new Client();
             client.setEnv(unSubscribeRequestHeader.getEnv());