activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-321 - server should stop if no more journal fil can be created.
Date Mon, 14 Dec 2015 19:40:14 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 8fa5bb2a0 -> 2a1b974a9


ARTEMIS-321 - server should stop if no more journal fil can be created.

https://issues.apache.org/jira/browse/ARTEMIS-321


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b7be2af8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b7be2af8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b7be2af8

Branch: refs/heads/master
Commit: b7be2af8a9dba4c3dcfe45ca78b71b1bbc9c0f28
Parents: 8fa5bb2
Author: Andy Taylor <andy.tayls67@gmail.com>
Authored: Mon Dec 14 16:56:20 2015 +0000
Committer: Andy Taylor <andy.tayls67@gmail.com>
Committed: Mon Dec 14 16:56:37 2015 +0000

----------------------------------------------------------------------
 .../artemis/core/journal/impl/JournalFilesRepository.java         | 3 ++-
 .../apache/activemq/artemis/journal/ActiveMQJournalBundle.java    | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b7be2af8/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
index a46c0b6..066638b 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
@@ -33,6 +33,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.activemq.artemis.core.io.SequentialFile;
 import org.apache.activemq.artemis.core.io.SequentialFileFactory;
+import org.apache.activemq.artemis.journal.ActiveMQJournalBundle;
 import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
 
 /**
@@ -435,7 +436,7 @@ public class JournalFilesRepository {
       while (nextFile == null) {
          nextFile = openedFiles.poll(5, TimeUnit.SECONDS);
          if (nextFile == null) {
-            ActiveMQJournalLogger.LOGGER.errorOpeningFile(new Exception("trace"));
+            fileFactory.onIOError(ActiveMQJournalBundle.BUNDLE.fileNotOpened(), "unable to
open ",  null);
          }
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b7be2af8/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java
b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java
index 474bf18..247064c 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java
@@ -44,4 +44,7 @@ public interface ActiveMQJournalBundle {
 
    @Message(id = 149003, value = "File not opened")
    ActiveMQIOErrorException fileNotOpened();
+
+   @Message(id = 149004, value = "unable to open file")
+   String unableToOpenFile();
 }


Mime
View raw message