Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #2039

This commit is contained in:
Clebert Suconic 2018-04-26 09:48:06 -04:00
parent 5daa3769aa 04d8390513
commit 9b13f5c5bd
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
View File

@ -1934,4 +1934,8 @@ public interface ActiveMQServerLogger extends BasicLogger {
@LogMessage(level = Logger.Level.WARN)
@Message(id = 224091, value = "Bridge {0} is unable to connect to destination. Retrying", format = Message.Format.MESSAGE_FORMAT)
void errorConnectingBridgeRetry(Bridge bridge);
@LogMessage(level = Logger.Level.INFO)
@Message(id = 224092, value = "Despite disabled persistence, page files will be persisted.", format = Message.Format.MESSAGE_FORMAT)
void pageWillBePersisted();
}

11
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -154,6 +154,7 @@ import org.apache.activemq.artemis.core.server.reload.ReloadManager;
import org.apache.activemq.artemis.core.server.reload.ReloadManagerImpl;
import org.apache.activemq.artemis.core.server.transformer.Transformer;
import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.core.settings.impl.DeletionPolicy;
import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository;
@ -2323,6 +2324,16 @@ public class ActiveMQServerImpl implements ActiveMQServer {
deployAddressSettingsFromConfiguration();
}
//fix of ARTEMIS-1823
if (!configuration.isPersistenceEnabled()) {
for (AddressSettings addressSettings : addressSettingsRepository.values()) {
if (addressSettings.getAddressFullMessagePolicy() == AddressFullMessagePolicy.PAGE) {
ActiveMQServerLogger.LOGGER.pageWillBePersisted();
break;
}
}
}
storageManager.start();
postOffice.start();