This is an automated email from the ASF dual-hosted git repository.
aaronai pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 527350dec Polish the unified remoting logger name.
527350dec is described below
commit 527350decf7bef547cd870660d101751cf97a090
Author: echooymxq <[email protected]>
AuthorDate: Thu Feb 16 11:06:13 2023 +0800
Polish the unified remoting logger name.
---
.../main/java/org/apache/rocketmq/common/constant/LoggerName.java | 2 ++
.../remoting/protocol/http2proxy/Http2ProtocolProxyHandler.java | 4 ++--
.../proxy/remoting/protocol/http2proxy/Http2ProxyBackendHandler.java | 4 ++--
.../remoting/protocol/http2proxy/Http2ProxyFrontendHandler.java | 4 ++--
.../java/org/apache/rocketmq/remoting/common/RemotingHelper.java | 5 ++---
.../main/java/org/apache/rocketmq/remoting/common/ServiceThread.java | 3 ++-
.../main/java/org/apache/rocketmq/remoting/netty/NettyDecoder.java | 3 ++-
.../main/java/org/apache/rocketmq/remoting/netty/NettyEncoder.java | 3 ++-
.../org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java | 3 ++-
.../java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java | 3 ++-
.../java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java | 5 +++--
.../src/main/java/org/apache/rocketmq/remoting/netty/TlsHelper.java | 4 ++--
.../java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java | 4 ++--
13 files changed, 27 insertions(+), 20 deletions(-)
diff --git
a/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java
b/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java
index 9797fddff..a871fc527 100644
--- a/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java
+++ b/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java
@@ -25,6 +25,8 @@ public class LoggerName {
public static final String BROKER_LOGGER_NAME = "RocketmqBroker";
public static final String BROKER_CONSOLE_NAME = "RocketmqConsole";
public static final String CLIENT_LOGGER_NAME = "RocketmqClient";
+ public static final String ROCKETMQ_TRAFFIC_NAME = "RocketmqTraffic";
+ public static final String ROCKETMQ_REMOTING_NAME = "RocketmqRemoting";
public static final String TOOLS_LOGGER_NAME = "RocketmqTools";
public static final String COMMON_LOGGER_NAME = "RocketmqCommon";
public static final String STORE_LOGGER_NAME = "RocketmqStore";
diff --git
a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProtocolProxyHandler.java
b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProtocolProxyHandler.java
index 033877e16..913f35c93 100644
---
a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProtocolProxyHandler.java
+++
b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProtocolProxyHandler.java
@@ -31,17 +31,17 @@ import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.SslProvider;
import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import javax.net.ssl.SSLException;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
import org.apache.rocketmq.proxy.config.ConfigurationManager;
import org.apache.rocketmq.proxy.config.ProxyConfig;
import org.apache.rocketmq.proxy.remoting.protocol.ProtocolHandler;
-import org.apache.rocketmq.remoting.common.RemotingHelper;
import org.apache.rocketmq.remoting.common.TlsMode;
import org.apache.rocketmq.remoting.netty.TlsSystemConfig;
public class Http2ProtocolProxyHandler implements ProtocolHandler {
- private static final Logger log =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ private static final Logger log =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
private static final String LOCAL_HOST = "127.0.0.1";
/**
* The int value of "PRI ". Now use 4 bytes to judge protocol, may be has
potential risks if there is a new protocol
diff --git
a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProxyBackendHandler.java
b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProxyBackendHandler.java
index dfcd144af..0195b0c1c 100644
---
a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProxyBackendHandler.java
+++
b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProxyBackendHandler.java
@@ -22,12 +22,12 @@ import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
-import org.apache.rocketmq.remoting.common.RemotingHelper;
public class Http2ProxyBackendHandler extends ChannelInboundHandlerAdapter {
- private static final Logger log =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ private static final Logger log =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
private final Channel inboundChannel;
diff --git
a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProxyFrontendHandler.java
b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProxyFrontendHandler.java
index 775c047b8..87147a322 100644
---
a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProxyFrontendHandler.java
+++
b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProxyFrontendHandler.java
@@ -23,12 +23,12 @@ import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
-import org.apache.rocketmq.remoting.common.RemotingHelper;
public class Http2ProxyFrontendHandler extends ChannelInboundHandlerAdapter {
- private static final Logger log =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ private static final Logger log =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
// As we use inboundChannel.eventLoop() when building the Bootstrap this
does not need to be volatile as
// the outboundChannel will use the same EventLoop (and therefore Thread)
as the inboundChannel.
private final Channel outboundChannel;
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java
index 809a31317..b9c4cdbfa 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java
@@ -26,6 +26,7 @@ import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.common.utils.NetworkUtil;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
@@ -37,12 +38,10 @@ import org.apache.rocketmq.remoting.netty.NettySystemConfig;
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
public class RemotingHelper {
- public static final String ROCKETMQ_TRAFFIC = "RocketmqTraffic";
- public static final String ROCKETMQ_REMOTING = "RocketmqRemoting";
public static final String DEFAULT_CHARSET = "UTF-8";
public static final String DEFAULT_CIDR_ALL = "0.0.0.0/0";
- private static final Logger log =
LoggerFactory.getLogger(ROCKETMQ_REMOTING);
+ private static final Logger log =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
private static final AttributeKey<String> REMOTE_ADDR_KEY =
AttributeKey.valueOf("RemoteAddr");
public static SocketAddress string2SocketAddress(final String addr) {
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/common/ServiceThread.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/common/ServiceThread.java
index d25222c52..a4ee81417 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/common/ServiceThread.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/common/ServiceThread.java
@@ -17,6 +17,7 @@
package org.apache.rocketmq.remoting.common;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
@@ -24,7 +25,7 @@ import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
* Base class for background thread
*/
public abstract class ServiceThread implements Runnable {
- private static final Logger log =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ private static final Logger log =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
private static final long JOIN_TIME = 90 * 1000;
protected final Thread thread;
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyDecoder.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyDecoder.java
index a54cfd278..19624d740 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyDecoder.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyDecoder.java
@@ -20,13 +20,14 @@ import com.google.common.base.Stopwatch;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
import org.apache.rocketmq.remoting.common.RemotingHelper;
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
public class NettyDecoder extends LengthFieldBasedFrameDecoder {
- private static final Logger log =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ private static final Logger log =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
private static final int FRAME_MAX_LENGTH =
Integer.parseInt(System.getProperty("com.rocketmq.remoting.frameMaxLength",
"16777216"));
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyEncoder.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyEncoder.java
index e6cf2759e..2af0af6b7 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyEncoder.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyEncoder.java
@@ -20,6 +20,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
import org.apache.rocketmq.remoting.common.RemotingHelper;
@@ -27,7 +28,7 @@ import org.apache.rocketmq.remoting.protocol.RemotingCommand;
@ChannelHandler.Sharable
public class NettyEncoder extends MessageToByteEncoder<RemotingCommand> {
- private static final Logger log =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ private static final Logger log =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
@Override
public void encode(ChannelHandlerContext ctx, RemotingCommand
remotingCommand, ByteBuf out)
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
index 0b8ef7086..4e9552ff1 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
@@ -43,6 +43,7 @@ import org.apache.rocketmq.common.AbortProcessException;
import org.apache.rocketmq.common.Pair;
import org.apache.rocketmq.common.ServiceThread;
import org.apache.rocketmq.common.UtilAll;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
import org.apache.rocketmq.remoting.ChannelEventListener;
@@ -70,7 +71,7 @@ public abstract class NettyRemotingAbstract {
/**
* Remoting logger instance.
*/
- private static final Logger log =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ private static final Logger log =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
/**
* Semaphore to limit maximum number of on-going one-way requests, which
protects system memory footprint.
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
index e94397409..e5097a4b1 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
@@ -69,6 +69,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.common.Pair;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
import org.apache.rocketmq.remoting.ChannelEventListener;
@@ -83,7 +84,7 @@ import org.apache.rocketmq.remoting.protocol.RemotingCommand;
import org.apache.rocketmq.remoting.proxy.SocksProxyConfig;
public class NettyRemotingClient extends NettyRemotingAbstract implements
RemotingClient {
- private static final Logger LOGGER =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
private static final long LOCK_TIMEOUT_MILLIS = 3000;
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
index 1d055e04e..e15110245 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
@@ -57,6 +57,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.rocketmq.common.Pair;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.common.utils.NetworkUtil;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
@@ -72,9 +73,9 @@ import org.apache.rocketmq.remoting.protocol.RemotingCommand;
@SuppressWarnings("NullableProblems")
public class NettyRemotingServer extends NettyRemotingAbstract implements
RemotingServer {
- private static final Logger log =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ private static final Logger log =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
private static final Logger TRAFFIC_LOGGER =
- LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_TRAFFIC);
+ LoggerFactory.getLogger(LoggerName.ROCKETMQ_TRAFFIC_NAME);
private final ServerBootstrap serverBootstrap;
private final EventLoopGroup eventLoopGroupSelector;
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/TlsHelper.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/TlsHelper.java
index 1f11847d1..9e73ad7ae 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/TlsHelper.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/TlsHelper.java
@@ -30,7 +30,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.security.cert.CertificateException;
import java.util.Properties;
-import org.apache.rocketmq.remoting.common.RemotingHelper;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
@@ -73,7 +73,7 @@ public class TlsHelper {
InputStream decryptPrivateKey(String privateKeyEncryptPath, boolean
forClient) throws IOException;
}
- private static final Logger LOGGER =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
private static DecryptionStrategy decryptionStrategy = new
DecryptionStrategy() {
@Override
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
index 0d694145c..ffbedf9bd 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
@@ -34,18 +34,18 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.lang3.StringUtils;
+import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
import org.apache.rocketmq.remoting.CommandCustomHeader;
import org.apache.rocketmq.remoting.annotation.CFNotNull;
-import org.apache.rocketmq.remoting.common.RemotingHelper;
import org.apache.rocketmq.remoting.exception.RemotingCommandException;
public class RemotingCommand {
public static final String SERIALIZE_TYPE_PROPERTY =
"rocketmq.serialize.type";
public static final String SERIALIZE_TYPE_ENV = "ROCKETMQ_SERIALIZE_TYPE";
public static final String REMOTING_VERSION_KEY =
"rocketmq.remoting.version";
- static final Logger log =
LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
+ static final Logger log =
LoggerFactory.getLogger(LoggerName.ROCKETMQ_REMOTING_NAME);
private static final int RPC_TYPE = 0; // 0, REQUEST_COMMAND
private static final int RPC_ONEWAY = 1; // 0, RPC
private static final Map<Class<? extends CommandCustomHeader>, Field[]>
CLASS_HASH_MAP =
