You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/03/23 18:49:31 UTC
[1/2] activemq-artemis git commit: ARTEMIS-375:When use ./artemis
data exp, the xml printed to stdout mixed with logging information
Repository: activemq-artemis
Updated Branches:
refs/heads/master 5612982a3 -> acb134316
ARTEMIS-375:When use ./artemis data exp, the xml printed to stdout mixed with logging information
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6c05a81b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6c05a81b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6c05a81b
Branch: refs/heads/master
Commit: 6c05a81ba2cb72da9a8e180e3bde503cc687b2d6
Parents: 5612982
Author: saurabhrai <ra...@hotmail.com>
Authored: Fri Mar 23 13:59:58 2018 +0530
Committer: saurabhrai <ra...@hotmail.com>
Committed: Fri Mar 23 13:59:58 2018 +0530
----------------------------------------------------------------------
.../persistence/impl/journal/JournalStorageManager.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6c05a81b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
index 498e9d5..9199bbe 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
@@ -137,15 +137,21 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
switch (config.getJournalType()) {
case NIO:
- ActiveMQServerLogger.LOGGER.journalUseNIO();
+ if (criticalErrorListener != null) {
+ ActiveMQServerLogger.LOGGER.journalUseNIO();
+ }
journalFF = new NIOSequentialFileFactory(config.getJournalLocation(), true, config.getJournalBufferSize_NIO(), config.getJournalBufferTimeout_NIO(), config.getJournalMaxIO_NIO(), config.isLogJournalWriteRate(), criticalErrorListener, getCriticalAnalyzer());
break;
case ASYNCIO:
- ActiveMQServerLogger.LOGGER.journalUseAIO();
+ if (criticalErrorListener != null) {
+ ActiveMQServerLogger.LOGGER.journalUseAIO();
+ }
journalFF = new AIOSequentialFileFactory(config.getJournalLocation(), config.getJournalBufferSize_AIO(), config.getJournalBufferTimeout_AIO(), config.getJournalMaxIO_AIO(), config.isLogJournalWriteRate(), criticalErrorListener, getCriticalAnalyzer());
break;
case MAPPED:
- ActiveMQServerLogger.LOGGER.journalUseMAPPED();
+ if (criticalErrorListener != null) {
+ ActiveMQServerLogger.LOGGER.journalUseMAPPED();
+ }
journalFF = new MappedSequentialFileFactory(config.getJournalLocation(), config.getJournalFileSize(), true, config.getJournalBufferSize_NIO(), config.getJournalBufferTimeout_NIO(), criticalErrorListener);
break;
default:
[2/2] activemq-artemis git commit: This closes #1973
Posted by cl...@apache.org.
This closes #1973
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/acb13431
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/acb13431
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/acb13431
Branch: refs/heads/master
Commit: acb134316e46bf8ad916f02ac24b917fef919e68
Parents: 5612982 6c05a81
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Mar 23 14:49:24 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Mar 23 14:49:24 2018 -0400
----------------------------------------------------------------------
.../persistence/impl/journal/JournalStorageManager.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------