diff --git a/broker/src/main/resources/rmq.broker.logback.xml b/broker/src/main/resources/rmq.broker.logback.xml index 3f920a1b4ab..499c6377b8a 100644 --- a/broker/src/main/resources/rmq.broker.logback.xml +++ b/broker/src/main/resources/rmq.broker.logback.xml @@ -18,6 +18,8 @@ + + brokerContainerLogDir diff --git a/common/src/main/java/org/apache/rocketmq/common/attribute/TopicMessageType.java b/common/src/main/java/org/apache/rocketmq/common/attribute/TopicMessageType.java index 9d3cb7608e5..dec21d096f9 100644 --- a/common/src/main/java/org/apache/rocketmq/common/attribute/TopicMessageType.java +++ b/common/src/main/java/org/apache/rocketmq/common/attribute/TopicMessageType.java @@ -33,9 +33,11 @@ public enum TopicMessageType { MIXED("MIXED"); private final String value; + private final String metricsValue; TopicMessageType(String value) { this.value = value; + this.metricsValue = value.toLowerCase(java.util.Locale.ROOT); } public static Set topicMessageTypeSet() { @@ -67,6 +69,6 @@ public static TopicMessageType parseFromMessageProperty(Map mess } public String getMetricsValue() { - return value.toLowerCase(); + return metricsValue; } } 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 52f7561d719..d80802c5cee 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 @@ -369,10 +369,12 @@ public static CompletableFuture convertChannelFutureToCompletableFuture(Ch } public static String getRequestCodeDesc(int code) { - return REQUEST_CODE_MAP.getOrDefault(code, String.valueOf(code)); + String desc = REQUEST_CODE_MAP.get(code); + return desc != null ? desc : String.valueOf(code); } public static String getResponseCodeDesc(int code) { - return RESPONSE_CODE_MAP.getOrDefault(code, String.valueOf(code)); + String desc = RESPONSE_CODE_MAP.get(code); + return desc != null ? desc : String.valueOf(code); } }