You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ni...@apache.org on 2016/12/27 05:33:57 UTC
[2/2] incubator-rocketmq git commit: [ROCKETMQ-9] Clean up the code
[ROCKETMQ-9] Clean up the code
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/b8564599
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/b8564599
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/b8564599
Branch: refs/heads/master
Commit: b85645996a573b19159ad184007484a99742cc5f
Parents: e8deb23
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Dec 27 13:33:43 2016 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Dec 27 13:33:43 2016 +0800
----------------------------------------------------------------------
.../main/java/com/alibaba/rocketmq/store/MappedFileQueue.java | 6 +++---
.../java/com/alibaba/rocketmq/store/index/IndexService.java | 4 ++--
rocketmq-store/src/test/resources/logback-test.xml | 1 +
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/b8564599/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFileQueue.java
----------------------------------------------------------------------
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFileQueue.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFileQueue.java
index 8d9d3ab..0d15ece 100644
--- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFileQueue.java
+++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFileQueue.java
@@ -484,10 +484,10 @@ public class MappedFileQueue {
try {
return this.mappedFiles.get(index);
} catch (Exception e) {
- if (returnFirstOnNotFound)
+ if (returnFirstOnNotFound) {
return mappedFile;
-
- LOG_ERROR.warn("findMappedFileByOffset failure. {}", UtilAll.currentStackTrace());
+ }
+ LOG_ERROR.warn("findMappedFileByOffset failure. ", e);
}
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/b8564599/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java
----------------------------------------------------------------------
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java
index fded747..f4f27bc 100644
--- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java
+++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java
@@ -279,7 +279,7 @@ public class IndexService {
*
* @return {@link IndexFile} or null on failure.
*/
- private IndexFile retryGetAndCreateIndexFile() {
+ public IndexFile retryGetAndCreateIndexFile() {
IndexFile indexFile = null;
for (int times = 0; null == indexFile && times < MAX_TRY_IDX_CREATE; times++) {
@@ -288,7 +288,7 @@ public class IndexService {
break;
try {
- log.error("Tried to create index file " + times + " times");
+ log.info("Tried to create index file " + times + " times");
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/b8564599/rocketmq-store/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/rocketmq-store/src/test/resources/logback-test.xml b/rocketmq-store/src/test/resources/logback-test.xml
index 11d429d..6754c0a 100644
--- a/rocketmq-store/src/test/resources/logback-test.xml
+++ b/rocketmq-store/src/test/resources/logback-test.xml
@@ -20,6 +20,7 @@
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{5} - %msg%n</pattern>
+ <charset class="java.nio.charset.Charset">UTF-8</charset>
</encoder>
</appender>