This is an automated email from the ASF dual-hosted git repository. shenlin pushed a commit to branch runtimer in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit 001776c5d45e4323e2659acb6f70794adde09609 Author: chengxy <[email protected]> AuthorDate: Thu May 25 10:07:41 2023 +0800 adjust logic --- .../eventbridge/adapter/runtime/Runtime.java | 4 +- .../adapter/runtime/boot/EventRuleTransfer.java | 4 +- .../adapter/runtime/boot/EventTargetTrigger.java | 3 +- .../adapter/runtime/utils/ExceptionUtil.java | 47 ++++++++++++++++++++++ 4 files changed, 53 insertions(+), 5 deletions(-) diff --git a/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/Runtime.java b/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/Runtime.java index aae2f70..af8bbbd 100644 --- a/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/Runtime.java +++ b/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/Runtime.java @@ -65,7 +65,7 @@ public class Runtime { @PostConstruct public void initAndStart() throws Exception { - logger.info("Start init runtimer."); + logger.info("Start init runtime."); circulatorContext.initCirculatorContext(runnerConfigObserver.getTargetRunnerConfig()); runnerConfigObserver.registerListener(circulatorContext); runnerConfigObserver.registerListener(eventSubscriber); @@ -84,7 +84,7 @@ public class Runtime { try { RUNTIME_START_AND_SHUTDOWN.shutdown(); } catch (Exception e) { - logger.error("err when shutdown rocketmq-proxy", e); + logger.error("err when shutdown runtime ", e); } })); diff --git a/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/boot/EventRuleTransfer.java b/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/boot/EventRuleTransfer.java index 91720bd..d7e41fc 100644 --- a/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/boot/EventRuleTransfer.java +++ b/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/boot/EventRuleTransfer.java @@ -32,7 +32,7 @@ import org.apache.rocketmq.eventbridge.adapter.runtime.boot.common.CirculatorCon import org.apache.rocketmq.eventbridge.adapter.runtime.boot.transfer.TransformEngine; import org.apache.rocketmq.eventbridge.adapter.runtime.common.ServiceThread; import org.apache.rocketmq.eventbridge.adapter.runtime.error.ErrorHandler; -import org.apache.rocketmq.eventbridge.adapter.runtime.utils.ShutdownUtils; +import org.apache.rocketmq.eventbridge.adapter.runtime.utils.ExceptionUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -127,7 +127,7 @@ public class EventRuleTransfer extends ServiceThread { try { circulatorContext.releaseTaskTransform(); } catch (Exception e) { - e.printStackTrace(); + logger.error(String.format("current thread: %s, error Track: %s ", getServiceName(), ExceptionUtil.getErrorMessage(e))); } } diff --git a/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/boot/EventTargetTrigger.java b/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/boot/EventTargetTrigger.java index 08b1383..3f61b10 100644 --- a/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/boot/EventTargetTrigger.java +++ b/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/boot/EventTargetTrigger.java @@ -30,6 +30,7 @@ import org.apache.rocketmq.eventbridge.adapter.runtime.boot.common.OffsetManager import org.apache.rocketmq.eventbridge.adapter.runtime.boot.common.CirculatorContext; import org.apache.rocketmq.eventbridge.adapter.runtime.common.ServiceThread; import org.apache.rocketmq.eventbridge.adapter.runtime.error.ErrorHandler; +import org.apache.rocketmq.eventbridge.adapter.runtime.utils.ExceptionUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -100,7 +101,7 @@ public class EventTargetTrigger extends ServiceThread { circulatorContext.releaseExecutorService(); circulatorContext.releaseTriggerTask(); } catch (Exception e) { - e.printStackTrace(); + logger.error(String.format("current thread: %s, error Track: %s ", getServiceName(), ExceptionUtil.getErrorMessage(e))); } } } diff --git a/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/utils/ExceptionUtil.java b/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/utils/ExceptionUtil.java new file mode 100644 index 0000000..e6a9d1d --- /dev/null +++ b/adapter/runtime/src/main/java/org/apache/rocketmq/eventbridge/adapter/runtime/utils/ExceptionUtil.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.rocketmq.eventbridge.adapter.runtime.utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.PrintWriter; +import java.io.StringWriter; + +public class ExceptionUtil { + + private static final Logger logger = LoggerFactory.getLogger(ExceptionUtil.class); + + public static String getErrorMessage(Throwable e) { + if (null == e) { + return null; + } + + try (StringWriter stringWriter = new StringWriter(); + PrintWriter writer = new PrintWriter(stringWriter)) { + e.printStackTrace(writer); + writer.flush(); + stringWriter.flush(); + StringBuffer buffer = stringWriter.getBuffer(); + return buffer.toString(); + } catch (Throwable ex) { + logger.error("", ex); + } + return null; + } +}
