You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/03/08 01:48:52 UTC
svn commit: r1575462 [2/3] - in /qpid/trunk/qpid/java:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
broker-core/src/main/java/org/apache/qpid/server/ broker-core/src/mai...
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Sat Mar 8 00:48:50 2014
@@ -64,9 +64,11 @@ public class ApplicationRegistry impleme
{
private static final Logger _logger = Logger.getLogger(ApplicationRegistry.class);
- private final VirtualHostRegistry _virtualHostRegistry = new VirtualHostRegistry();
+ private final EventLogger _eventLogger;
- private volatile RootMessageLogger _rootMessageLogger;
+ private final VirtualHostRegistry _virtualHostRegistry;
+
+ private volatile MessageLogger _messageLogger;
private Broker _broker;
@@ -78,14 +80,11 @@ public class ApplicationRegistry impleme
private ConfigurationEntryStore _store;
private TaskExecutor _taskExecutor;
- protected void setRootMessageLogger(RootMessageLogger rootMessageLogger)
- {
- _rootMessageLogger = rootMessageLogger;
- }
-
- public ApplicationRegistry(ConfigurationEntryStore store)
+ public ApplicationRegistry(ConfigurationEntryStore store, EventLogger eventLogger)
{
_store = store;
+ _eventLogger = eventLogger;
+ _virtualHostRegistry = new VirtualHostRegistry(eventLogger);
initialiseStatistics();
}
@@ -93,14 +92,14 @@ public class ApplicationRegistry impleme
{
// Create the RootLogger to be used during broker operation
boolean statusUpdatesEnabled = Boolean.parseBoolean(System.getProperty(BrokerProperties.PROPERTY_STATUS_UPDATES, "true"));
- _rootMessageLogger = new Log4jMessageLogger(statusUpdatesEnabled);
+ _messageLogger = new Log4jMessageLogger(statusUpdatesEnabled);
_logRecorder = new LogRecorder();
//Create the composite (log4j+SystemOut MessageLogger to be used during startup
- RootMessageLogger[] messageLoggers = {new SystemOutMessageLogger(), _rootMessageLogger};
+ MessageLogger[] messageLoggers = {new SystemOutMessageLogger(), _messageLogger};
CompositeStartupMessageLogger startupMessageLogger = new CompositeStartupMessageLogger(messageLoggers);
- SystemLog.setRootMessageLogger(startupMessageLogger);
+ _eventLogger.setMessageLogger(startupMessageLogger);
logStartupMessages();
@@ -108,7 +107,8 @@ public class ApplicationRegistry impleme
_taskExecutor.start();
StoreConfigurationChangeListener storeChangeListener = new StoreConfigurationChangeListener(_store);
- RecovererProvider provider = new DefaultRecovererProvider((StatisticsGatherer)this, _virtualHostRegistry, _logRecorder, _rootMessageLogger, _taskExecutor, brokerOptions, storeChangeListener);
+ RecovererProvider provider = new DefaultRecovererProvider((StatisticsGatherer)this, _virtualHostRegistry, _logRecorder,
+ _eventLogger, _taskExecutor, brokerOptions, storeChangeListener);
ConfiguredObjectRecoverer<? extends ConfiguredObject> brokerRecoverer = provider.getRecoverer(Broker.class.getSimpleName());
_broker = (Broker) brokerRecoverer.create(provider, _store.getRootEntry());
@@ -119,8 +119,8 @@ public class ApplicationRegistry impleme
// starting the broker
_broker.setDesiredState(State.INITIALISING, State.ACTIVE);
- SystemLog.message(BrokerMessages.READY());
- SystemLog.setRootMessageLogger(_rootMessageLogger);
+ _eventLogger.message(BrokerMessages.READY());
+ _eventLogger.setMessageLogger(_messageLogger);
}
@@ -133,7 +133,7 @@ public class ApplicationRegistry impleme
if (report > 0L)
{
_reportingTimer = new Timer("Statistics-Reporting", true);
- StatisticsReportingTask task = new StatisticsReportingTask(reset, _rootMessageLogger);
+ StatisticsReportingTask task = new StatisticsReportingTask(reset, _messageLogger);
_reportingTimer.scheduleAtFixedRate(task, report / 2, report);
}
}
@@ -144,10 +144,10 @@ public class ApplicationRegistry impleme
private final int RECEIVED = 1;
private final boolean _reset;
- private final RootMessageLogger _logger;
+ private final MessageLogger _logger;
private final Subject _subject;
- public StatisticsReportingTask(boolean reset, RootMessageLogger logger)
+ public StatisticsReportingTask(boolean reset, MessageLogger logger)
{
_reset = reset;
_logger = logger;
@@ -174,10 +174,12 @@ public class ApplicationRegistry impleme
{
try
{
- SystemLog.message(BrokerMessages.STATS_DATA(DELIVERED, _dataDelivered.getPeak() / 1024.0, _dataDelivered.getTotal()));
- SystemLog.message(BrokerMessages.STATS_MSGS(DELIVERED, _messagesDelivered.getPeak(), _messagesDelivered.getTotal()));
- SystemLog.message(BrokerMessages.STATS_DATA(RECEIVED, _dataReceived.getPeak() / 1024.0, _dataReceived.getTotal()));
- SystemLog.message(BrokerMessages.STATS_MSGS(RECEIVED, _messagesReceived.getPeak(), _messagesReceived.getTotal()));
+ _eventLogger.message(BrokerMessages.STATS_DATA(DELIVERED, _dataDelivered.getPeak() / 1024.0, _dataDelivered.getTotal()));
+ _eventLogger.message(BrokerMessages.STATS_MSGS(DELIVERED, _messagesDelivered.getPeak(), _messagesDelivered.getTotal()));
+ _eventLogger.message(BrokerMessages.STATS_DATA(RECEIVED, _dataReceived.getPeak() / 1024.0, _dataReceived.getTotal()));
+ _eventLogger.message(BrokerMessages.STATS_MSGS(RECEIVED,
+ _messagesReceived.getPeak(),
+ _messagesReceived.getTotal()));
Collection<VirtualHost> hosts = _virtualHostRegistry.getVirtualHosts();
if (hosts.size() > 1)
@@ -189,11 +191,11 @@ public class ApplicationRegistry impleme
StatisticsCounter messagesDelivered = vhost.getMessageDeliveryStatistics();
StatisticsCounter dataReceived = vhost.getDataReceiptStatistics();
StatisticsCounter messagesReceived = vhost.getMessageReceiptStatistics();
-
- SystemLog.message(VirtualHostMessages.STATS_DATA(name, DELIVERED, dataDelivered.getPeak() / 1024.0, dataDelivered.getTotal()));
- SystemLog.message(VirtualHostMessages.STATS_MSGS(name, DELIVERED, messagesDelivered.getPeak(), messagesDelivered.getTotal()));
- SystemLog.message(VirtualHostMessages.STATS_DATA(name, RECEIVED, dataReceived.getPeak() / 1024.0, dataReceived.getTotal()));
- SystemLog.message(VirtualHostMessages.STATS_MSGS(name, RECEIVED, messagesReceived.getPeak(), messagesReceived.getTotal()));
+ EventLogger logger = vhost.getEventLogger();
+ logger.message(VirtualHostMessages.STATS_DATA(name, DELIVERED, dataDelivered.getPeak() / 1024.0, dataDelivered.getTotal()));
+ logger.message(VirtualHostMessages.STATS_MSGS(name, DELIVERED, messagesDelivered.getPeak(), messagesDelivered.getTotal()));
+ logger.message(VirtualHostMessages.STATS_DATA(name, RECEIVED, dataReceived.getPeak() / 1024.0, dataReceived.getTotal()));
+ logger.message(VirtualHostMessages.STATS_MSGS(name, RECEIVED, messagesReceived.getPeak(), messagesReceived.getTotal()));
}
}
@@ -256,7 +258,7 @@ public class ApplicationRegistry impleme
_taskExecutor.stop();
}
- SystemLog.message(BrokerMessages.STOPPED());
+ _eventLogger.message(BrokerMessages.STOPPED());
_logRecorder.closeLogRecorder();
@@ -327,15 +329,15 @@ public class ApplicationRegistry impleme
private void logStartupMessages()
{
- SystemLog.message(BrokerMessages.STARTUP(QpidProperties.getReleaseVersion(), QpidProperties.getBuildVersion()));
+ _eventLogger.message(BrokerMessages.STARTUP(QpidProperties.getReleaseVersion(), QpidProperties.getBuildVersion()));
- SystemLog.message(BrokerMessages.PLATFORM(System.getProperty("java.vendor"),
+ _eventLogger.message(BrokerMessages.PLATFORM(System.getProperty("java.vendor"),
System.getProperty("java.runtime.version", System.getProperty("java.version")),
SystemUtils.getOSName(),
SystemUtils.getOSVersion(),
SystemUtils.getOSArch()));
- SystemLog.message(BrokerMessages.MAX_MEMORY(Runtime.getRuntime().maxMemory()));
+ _eventLogger.message(BrokerMessages.MAX_MEMORY(Runtime.getRuntime().maxMemory()));
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java Sat Mar 8 00:48:50 2014
@@ -97,7 +97,7 @@ public class SecurityManager implements
public SecurityManager(SecurityManager parent, String aclFile, String vhostName)
{
_managementMode = parent._managementMode;
-
+ _broker = parent._broker;
if(!_managementMode)
{
configureVirtualHostAclPlugin(aclFile, vhostName);
@@ -118,7 +118,7 @@ public class SecurityManager implements
for (AccessControlFactory provider : (new QpidServiceLoader<AccessControlFactory>()).instancesOf(AccessControlFactory.class))
{
- AccessControl accessControl = provider.createInstance(attributes);
+ AccessControl accessControl = provider.createInstance(attributes, _broker.getEventLogger());
accessControl.open();
if(accessControl != null)
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationRecoverer.java Sat Mar 8 00:48:50 2014
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.UUID;
import org.apache.log4j.Logger;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.SystemLog;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.ConfigStoreMessages;
import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
@@ -47,6 +47,7 @@ public class DurableConfigurationRecover
new HashMap<String, Map<UUID, List<DependencyListener>>>();
private final Map<String, DurableConfiguredObjectRecoverer> _recoverers;
private final UpgraderProvider _upgraderProvider;
+ private final EventLogger _eventLogger;
private DurableConfigurationStoreUpgrader _upgrader;
@@ -57,11 +58,12 @@ public class DurableConfigurationRecover
public DurableConfigurationRecoverer(final String name,
Map<String, DurableConfiguredObjectRecoverer> recoverers,
- UpgraderProvider upgraderProvider)
+ UpgraderProvider upgraderProvider, EventLogger eventLogger)
{
_recoverers = recoverers;
_name = name;
_upgraderProvider = upgraderProvider;
+ _eventLogger = eventLogger;
}
@Override
@@ -102,7 +104,7 @@ public class DurableConfigurationRecover
checkUnresolvedDependencies();
applyUpgrade();
- SystemLog.message(_logSubject, ConfigStoreMessages.RECOVERY_COMPLETE());
+ _eventLogger.message(_logSubject, ConfigStoreMessages.RECOVERY_COMPLETE());
return CURRENT_CONFIG_VERSION;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/OperationalLoggingListener.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/OperationalLoggingListener.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/OperationalLoggingListener.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/OperationalLoggingListener.java Sat Mar 8 00:48:50 2014
@@ -19,8 +19,8 @@
*/
package org.apache.qpid.server.store;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.SystemLog;
import org.apache.qpid.server.logging.messages.ConfigStoreMessages;
import org.apache.qpid.server.logging.messages.MessageStoreMessages;
import org.apache.qpid.server.logging.messages.TransactionLogMessages;
@@ -29,10 +29,13 @@ public class OperationalLoggingListener
{
protected final LogSubject _logSubject;
private MessageStore _store;
+ private final EventLogger _eventLogger;
- private OperationalLoggingListener(final MessageStore store, LogSubject logSubject)
+
+ private OperationalLoggingListener(final MessageStore store, LogSubject logSubject, final EventLogger eventLogger)
{
_logSubject = logSubject;
+ _eventLogger = eventLogger;
store.addEventListener(this,
Event.BEFORE_INIT,
Event.AFTER_INIT,
@@ -42,45 +45,47 @@ public class OperationalLoggingListener
Event.PERSISTENT_MESSAGE_SIZE_OVERFULL,
Event.PERSISTENT_MESSAGE_SIZE_UNDERFULL);
_store = store;
+
}
public void event(Event event)
{
+
switch(event)
{
case BEFORE_INIT:
- SystemLog.message(_logSubject, ConfigStoreMessages.CREATED());
+ _eventLogger.message(_logSubject, ConfigStoreMessages.CREATED());
break;
case AFTER_INIT:
- SystemLog.message(_logSubject, MessageStoreMessages.CREATED());
- SystemLog.message(_logSubject, TransactionLogMessages.CREATED());
+ _eventLogger.message(_logSubject, MessageStoreMessages.CREATED());
+ _eventLogger.message(_logSubject, TransactionLogMessages.CREATED());
String storeLocation = _store.getStoreLocation();
if (storeLocation != null)
{
- SystemLog.message(_logSubject, MessageStoreMessages.STORE_LOCATION(storeLocation));
+ _eventLogger.message(_logSubject, MessageStoreMessages.STORE_LOCATION(storeLocation));
}
break;
case BEFORE_ACTIVATE:
- SystemLog.message(_logSubject, MessageStoreMessages.RECOVERY_START());
+ _eventLogger.message(_logSubject, MessageStoreMessages.RECOVERY_START());
break;
case AFTER_ACTIVATE:
- SystemLog.message(_logSubject, MessageStoreMessages.RECOVERY_COMPLETE());
+ _eventLogger.message(_logSubject, MessageStoreMessages.RECOVERY_COMPLETE());
break;
case AFTER_CLOSE:
- SystemLog.message(_logSubject, MessageStoreMessages.CLOSED());
+ _eventLogger.message(_logSubject, MessageStoreMessages.CLOSED());
break;
case PERSISTENT_MESSAGE_SIZE_OVERFULL:
- SystemLog.message(_logSubject, MessageStoreMessages.OVERFULL());
+ _eventLogger.message(_logSubject, MessageStoreMessages.OVERFULL());
break;
case PERSISTENT_MESSAGE_SIZE_UNDERFULL:
- SystemLog.message(_logSubject, MessageStoreMessages.UNDERFULL());
+ _eventLogger.message(_logSubject, MessageStoreMessages.UNDERFULL());
break;
}
}
- public static void listen(final MessageStore store, LogSubject logSubject)
+ public static void listen(final MessageStore store, LogSubject logSubject, final EventLogger eventLogger)
{
- new OperationalLoggingListener(store, logSubject);
+ new OperationalLoggingListener(store, logSubject, eventLogger);
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Sat Mar 8 00:48:50 2014
@@ -38,7 +38,7 @@ import org.apache.qpid.exchange.Exchange
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
import org.apache.qpid.server.exchange.ExchangeImpl;
-import org.apache.qpid.server.logging.SystemLog;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.configuration.ExchangeConfiguration;
@@ -125,6 +125,8 @@ public abstract class AbstractVirtualHos
private final Map<String, MessageSource> _systemNodeSources =
Collections.synchronizedMap(new HashMap<String,MessageSource>());
+ private final EventLogger _eventLogger;
+
public AbstractVirtualHost(VirtualHostRegistry virtualHostRegistry,
StatisticsGatherer brokerStatisticsGatherer,
@@ -148,10 +150,11 @@ public abstract class AbstractVirtualHos
_name = _vhostConfig.getName();
_dtxRegistry = new DtxRegistry();
_model = virtualHost;
+ _eventLogger = virtualHostRegistry.getEventLogger();
_id = UUIDGenerator.generateVhostUUID(_name);
- SystemLog.message(VirtualHostMessages.CREATED(_name));
+ _eventLogger.message(VirtualHostMessages.CREATED(_name));
_securityManager = new SecurityManager(parentSecurityManager, _vhostConfig.getConfig().getString("security.acl"), _name);
@@ -212,6 +215,12 @@ public abstract class AbstractVirtualHos
return false;
}
+ @Override
+ public EventLogger getEventLogger()
+ {
+ return _eventLogger;
+ }
+
/**
* Initialise a housekeeping task to iterate over queues cleaning expired messages with no consumers
* and checking for idle or open transactions that have exceeded the permitted thresholds.
@@ -705,7 +714,7 @@ public abstract class AbstractVirtualHos
_state = State.STOPPED;
- SystemLog.message(VirtualHostMessages.CLOSED());
+ _eventLogger.message(VirtualHostMessages.CLOSED());
}
protected void closeStorage()
@@ -912,7 +921,7 @@ public abstract class AbstractVirtualHos
{
if (state == State.ERRORED)
{
- SystemLog.message(VirtualHostMessages.ERRORED());
+ _eventLogger.message(VirtualHostMessages.ERRORED());
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java Sat Mar 8 00:48:50 2014
@@ -90,7 +90,7 @@ public class StandardVirtualHost extends
final
MessageStoreLogSubject
storeLogSubject = new MessageStoreLogSubject(getName(), messageStore.getClass().getSimpleName());
- OperationalLoggingListener.listen(messageStore, storeLogSubject);
+ OperationalLoggingListener.listen(messageStore, storeLogSubject, getEventLogger());
return messageStore;
}
@@ -126,10 +126,10 @@ public class StandardVirtualHost extends
DurableConfigurationRecoverer configRecoverer =
new DurableConfigurationRecoverer(getName(), getDurableConfigurationRecoverers(),
- new DefaultUpgraderProvider(this, getExchangeRegistry()));
+ new DefaultUpgraderProvider(this, getExchangeRegistry()), getEventLogger());
_durableConfigurationStore.configureConfigStore(virtualHost, configRecoverer);
- VirtualHostConfigRecoveryHandler recoveryHandler = new VirtualHostConfigRecoveryHandler(this, getExchangeRegistry(), getExchangeFactory());
+ VirtualHostConfigRecoveryHandler recoveryHandler = new VirtualHostConfigRecoveryHandler(this);
_messageStore.configureMessageStore(virtualHost, recoveryHandler, recoveryHandler);
initialiseModel(hostConfig);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java Sat Mar 8 00:48:50 2014
@@ -31,6 +31,7 @@ import org.apache.qpid.common.Closeable;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.connection.IConnectionRegistry;
import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.plugin.ExchangeType;
@@ -137,4 +138,6 @@ public interface VirtualHost extends Dur
TaskExecutor getTaskExecutor();
org.apache.qpid.server.model.VirtualHost getModel();
+
+ EventLogger getEventLogger();
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java Sat Mar 8 00:48:50 2014
@@ -26,9 +26,7 @@ import java.util.TreeMap;
import java.util.UUID;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.exchange.ExchangeFactory;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.logging.SystemLog;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.TransactionLogMessages;
import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
import org.apache.qpid.server.message.EnqueueableMessage;
@@ -62,27 +60,22 @@ public class VirtualHostConfigRecoveryHa
private final Map<String, Integer> _queueRecoveries = new TreeMap<String, Integer>();
private final Map<Long, ServerMessage> _recoveredMessages = new HashMap<Long, ServerMessage>();
private final Map<Long, StoredMessage> _unusedMessages = new HashMap<Long, StoredMessage>();
-
- private final ExchangeRegistry _exchangeRegistry;
- private final ExchangeFactory _exchangeFactory;
+ private final EventLogger _eventLogger;
private MessageStoreLogSubject _logSubject;
private MessageStore _store;
- public VirtualHostConfigRecoveryHandler(VirtualHost virtualHost,
- ExchangeRegistry exchangeRegistry,
- ExchangeFactory exchangeFactory)
+ public VirtualHostConfigRecoveryHandler(VirtualHost virtualHost)
{
_virtualHost = virtualHost;
- _exchangeRegistry = exchangeRegistry;
- _exchangeFactory = exchangeFactory;
+ _eventLogger = virtualHost.getEventLogger();
}
public VirtualHostConfigRecoveryHandler begin(MessageStore store)
{
_logSubject = new MessageStoreLogSubject(_virtualHost.getName(), store.getClass().getSimpleName());
_store = store;
- SystemLog.message(_logSubject, TransactionLogMessages.RECOVERY_START(null, false));
+ _eventLogger.message(_logSubject, TransactionLogMessages.RECOVERY_START(null, false));
return this;
}
@@ -149,7 +142,7 @@ public class VirtualHostConfigRecoveryHa
else
{
StringBuilder xidString = xidAsString(id);
- SystemLog.message(_logSubject,
+ _eventLogger.message(_logSubject,
TransactionLogMessages.XA_INCOMPLETE_MESSAGE(xidString.toString(),
Long.toString(messageId)));
@@ -159,7 +152,7 @@ public class VirtualHostConfigRecoveryHa
else
{
StringBuilder xidString = xidAsString(id);
- SystemLog.message(_logSubject,
+ _eventLogger.message(_logSubject,
TransactionLogMessages.XA_INCOMPLETE_QUEUE(xidString.toString(),
record.getResource().getId().toString()));
@@ -199,7 +192,7 @@ public class VirtualHostConfigRecoveryHa
else
{
StringBuilder xidString = xidAsString(id);
- SystemLog.message(_logSubject,
+ _eventLogger.message(_logSubject,
TransactionLogMessages.XA_INCOMPLETE_MESSAGE(xidString.toString(),
Long.toString(messageId)));
@@ -209,7 +202,7 @@ public class VirtualHostConfigRecoveryHa
else
{
StringBuilder xidString = xidAsString(id);
- SystemLog.message(_logSubject,
+ _eventLogger.message(_logSubject,
TransactionLogMessages.XA_INCOMPLETE_QUEUE(xidString.toString(),
record.getResource().getId().toString()));
}
@@ -238,7 +231,7 @@ public class VirtualHostConfigRecoveryHa
_logger.warn("Message id " + m.getMessageNumber() + " in store, but not in any queue - removing....");
m.remove();
}
- SystemLog.message(_logSubject, TransactionLogMessages.RECOVERY_COMPLETE(null, false));
+ _eventLogger.message(_logSubject, TransactionLogMessages.RECOVERY_COMPLETE(null, false));
}
public void complete()
@@ -316,9 +309,9 @@ public class VirtualHostConfigRecoveryHa
for(Map.Entry<String,Integer> entry : _queueRecoveries.entrySet())
{
- SystemLog.message(_logSubject, TransactionLogMessages.RECOVERED(entry.getValue(), entry.getKey()));
+ _eventLogger.message(_logSubject, TransactionLogMessages.RECOVERED(entry.getValue(), entry.getKey()));
- SystemLog.message(_logSubject, TransactionLogMessages.RECOVERY_COMPLETE(entry.getKey(), true));
+ _eventLogger.message(_logSubject, TransactionLogMessages.RECOVERY_COMPLETE(entry.getKey(), true));
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java Sat Mar 8 00:48:50 2014
@@ -21,6 +21,7 @@
package org.apache.qpid.server.virtualhost;
import org.apache.qpid.common.Closeable;
+import org.apache.qpid.server.logging.EventLogger;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,11 +33,12 @@ public class VirtualHostRegistry impleme
{
private final Map<String, VirtualHost> _registry = new ConcurrentHashMap<String, VirtualHost>();
private String _defaultVirtualHostName;
+ private final EventLogger _eventLogger;
- public VirtualHostRegistry()
+ public VirtualHostRegistry(EventLogger eventLogger)
{
- super();
+ _eventLogger = eventLogger;
}
public synchronized void registerVirtualHost(VirtualHost host)
@@ -92,4 +94,8 @@ public class VirtualHostRegistry impleme
}
}
+ public EventLogger getEventLogger()
+ {
+ return _eventLogger;
+ }
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java Sat Mar 8 00:48:50 2014
@@ -31,10 +31,10 @@ import static org.mockito.Mockito.verify
import static org.mockito.Mockito.when;
import org.apache.qpid.server.TransactionTimeoutHelper.CloseAction;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.RootMessageLogger;
-import org.apache.qpid.server.logging.SystemLog;
+import org.apache.qpid.server.logging.MessageLogger;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.test.utils.QpidTestCase;
import org.hamcrest.Description;
@@ -42,7 +42,7 @@ import org.mockito.ArgumentMatcher;
public class TransactionTimeoutHelperTest extends QpidTestCase
{
- private final RootMessageLogger _rootLogger = mock(RootMessageLogger.class);
+ private final MessageLogger _rootLogger = mock(MessageLogger.class);
private final LogSubject _logSubject = mock(LogSubject.class);
private final ServerTransaction _transaction = mock(ServerTransaction.class);
private final CloseAction _closeAction = mock(CloseAction.class);
@@ -154,8 +154,9 @@ public class TransactionTimeoutHelperTes
when(_logSubject.toLogString()).thenReturn("");
when(_rootLogger.isEnabled()).thenReturn(true);
when(_rootLogger.isMessageEnabled(anyString())).thenReturn(true);
- SystemLog.setRootMessageLogger(_rootLogger);
- _transactionTimeoutHelper = new TransactionTimeoutHelper(_logSubject, _closeAction);
+ EventLogger eventLogger = new EventLogger(_rootLogger);
+
+ _transactionTimeoutHelper = new TransactionTimeoutHelper(_logSubject, _closeAction, eventLogger);
_now = System.currentTimeMillis();
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java Sat Mar 8 00:48:50 2014
@@ -26,6 +26,8 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.NullMessageLogger;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.queue.PriorityQueue;
import org.apache.qpid.server.queue.AMQQueue;
@@ -49,7 +51,8 @@ public class VirtualHostConfigurationTes
_configXml = new XMLConfiguration();
_configXml.addProperty("virtualhosts.virtualhost(-1).name", getName());
_configXml.addProperty("virtualhosts.virtualhost(-1)."+getName()+".store.class", TestableMemoryMessageStore.class.getName());
- _virtualHostRegistry = new VirtualHostRegistry();
+ EventLogger eventLogger = new EventLogger();
+ _virtualHostRegistry = new VirtualHostRegistry(eventLogger);
_broker = mock(Broker.class);
when(_broker.getAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD)).thenReturn(30000l);
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java Sat Mar 8 00:48:50 2014
@@ -38,8 +38,9 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.RecovererProvider;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
-import org.apache.qpid.server.logging.RootMessageLogger;
+import org.apache.qpid.server.logging.MessageLogger;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -77,7 +78,7 @@ public class BrokerRecovererTest extends
super.setUp();
_brokerRecoverer = new BrokerRecoverer(mock(AuthenticationProviderFactory.class), mock(GroupProviderFactory.class), mock(AccessControlProviderFactory.class), mock(PortFactory.class),
- mock(StatisticsGatherer.class), mock(VirtualHostRegistry.class), mock(LogRecorder.class), mock(RootMessageLogger.class), mock(TaskExecutor.class), mock(BrokerOptions.class),
+ mock(StatisticsGatherer.class), mock(VirtualHostRegistry.class), mock(LogRecorder.class), new EventLogger(), mock(TaskExecutor.class), mock(BrokerOptions.class),
mock(StoreConfigurationChangeListener.class));
when(_brokerEntry.getId()).thenReturn(_brokerId);
when(_brokerEntry.getChildren()).thenReturn(_brokerEntryChildren);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java Sat Mar 8 00:48:50 2014
@@ -25,8 +25,9 @@ import junit.framework.TestCase;
import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
-import org.apache.qpid.server.logging.RootMessageLogger;
+import org.apache.qpid.server.logging.MessageLogger;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.GroupProvider;
@@ -53,11 +54,11 @@ public class DefaultRecovererProviderTes
StatisticsGatherer statisticsGatherer = mock(StatisticsGatherer.class);
VirtualHostRegistry virtualHostRegistry = mock(VirtualHostRegistry.class);
LogRecorder logRecorder = mock(LogRecorder.class);
- RootMessageLogger rootMessageLogger = mock(RootMessageLogger.class);
+
TaskExecutor taskExecutor = mock(TaskExecutor.class);
DefaultRecovererProvider provider = new DefaultRecovererProvider(statisticsGatherer, virtualHostRegistry,
- logRecorder, rootMessageLogger, taskExecutor, mock(BrokerOptions.class),
+ logRecorder, new EventLogger(), taskExecutor, mock(BrokerOptions.class),
mock(StoreConfigurationChangeListener.class));
for (String configuredObjectType : supportedTypes)
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java Sat Mar 8 00:48:50 2014
@@ -33,6 +33,7 @@ import java.util.UUID;
import junit.framework.TestCase;
import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.ServerMessage;
@@ -60,6 +61,7 @@ public class FanoutExchangeTest extends
_virtualHost = mock(VirtualHost.class);
SecurityManager securityManager = mock(SecurityManager.class);
when(_virtualHost.getSecurityManager()).thenReturn(securityManager);
+ when(_virtualHost.getEventLogger()).thenReturn(new EventLogger());
_exchange = new FanoutExchange(_virtualHost, attributes);
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java Sat Mar 8 00:48:50 2014
@@ -24,6 +24,7 @@ import java.util.Collection;
import junit.framework.TestCase;
import org.apache.qpid.server.binding.BindingImpl;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.plugin.ExchangeType;
import org.apache.qpid.server.queue.AMQQueue;
@@ -146,8 +147,11 @@ public class HeadersBindingTest extends
VirtualHost vhost = mock(VirtualHost.class);
when(_queue.getVirtualHost()).thenReturn(vhost);
when(vhost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
+ final EventLogger eventLogger = new EventLogger();
+ when(vhost.getEventLogger()).thenReturn(eventLogger);
_exchange = mock(ExchangeImpl.class);
when(_exchange.getExchangeType()).thenReturn(mock(ExchangeType.class));
+ when(_exchange.getEventLogger()).thenReturn(eventLogger);
}
protected String getQueueName()
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Sat Mar 8 00:48:50 2014
@@ -30,6 +30,7 @@ import java.util.Set;
import java.util.UUID;
import junit.framework.TestCase;
import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.ServerMessage;
@@ -59,6 +60,7 @@ public class HeadersExchangeTest extends
_virtualHost = mock(VirtualHost.class);
SecurityManager securityManager = mock(SecurityManager.class);
when(_virtualHost.getSecurityManager()).thenReturn(securityManager);
+ when(_virtualHost.getEventLogger()).thenReturn(new EventLogger());
Map<String,Object> attributes = new HashMap<String, Object>();
attributes.put(Exchange.ID, UUID.randomUUID());
attributes.put(Exchange.NAME, "test");
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java Sat Mar 8 00:48:50 2014
@@ -24,7 +24,7 @@ package org.apache.qpid.server.logging;
import java.util.LinkedList;
import java.util.List;
-public class UnitTestMessageLogger extends AbstractRootMessageLogger
+public class UnitTestMessageLogger extends AbstractMessageLogger
{
private final List<Object> _log = new LinkedList<Object>();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java Sat Mar 8 00:48:50 2014
@@ -23,7 +23,6 @@ package org.apache.qpid.server.logging.a
import org.apache.qpid.server.connection.ConnectionPrincipal;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.SystemLog;
import javax.security.auth.Subject;
import java.security.PrivilegedAction;
@@ -108,7 +107,7 @@ public class AMQPConnectionActorTest ext
@Override
public Object run()
{
- SystemLog.message(new LogSubject()
+ getEventLogger().message(new LogSubject()
{
public String toLogString()
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java Sat Mar 8 00:48:50 2014
@@ -20,10 +20,10 @@
*/
package org.apache.qpid.server.logging.actors;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.RootMessageLogger;
-import org.apache.qpid.server.logging.SystemLog;
+import org.apache.qpid.server.logging.MessageLogger;
import org.apache.qpid.server.logging.UnitTestMessageLogger;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -31,15 +31,16 @@ public class BaseActorTestCase extends Q
{
private boolean _statusUpdatesEnabled = true;
private UnitTestMessageLogger _rawLogger;
- private RootMessageLogger _rootLogger;
+ private MessageLogger _rootLogger;
+ private EventLogger _eventLogger;
@Override
public void setUp() throws Exception
{
super.setUp();
_rawLogger = new UnitTestMessageLogger(_statusUpdatesEnabled);
+ _eventLogger = new EventLogger(_rawLogger);
_rootLogger = _rawLogger;
- SystemLog.setRootMessageLogger(_rootLogger);
}
@Override
@@ -62,7 +63,7 @@ public class BaseActorTestCase extends Q
public void sendTestLogMessage(final String message)
{
- SystemLog.message(new LogSubject()
+ getEventLogger().message(new LogSubject()
{
public String toLogString()
{
@@ -99,9 +100,9 @@ public class BaseActorTestCase extends Q
return _rawLogger;
}
- public RootMessageLogger getRootLogger()
+ public EventLogger getEventLogger()
{
- return _rootLogger;
+ return _eventLogger;
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java Sat Mar 8 00:48:50 2014
@@ -23,7 +23,6 @@ package org.apache.qpid.server.logging.a
import javax.security.auth.Subject;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.SystemLog;
import org.apache.qpid.server.security.auth.ManagementConnectionPrincipal;
import org.apache.qpid.server.security.auth.TestPrincipalUtils;
@@ -125,7 +124,7 @@ public class HttpManagementActorTest ext
@Override
public Object run()
{
- SystemLog.message(EMPTY_MESSAGE);
+ getEventLogger().message(EMPTY_MESSAGE);
List<Object> logs = getRawLogger().getLogMessages();
assertEquals("Message log size not as expected.", 1, logs.size());
@@ -148,7 +147,7 @@ public class HttpManagementActorTest ext
{
public String run()
{
- SystemLog.message(EMPTY_MESSAGE);
+ getEventLogger().message(EMPTY_MESSAGE);
List<Object> logs = getRawLogger().getLogMessages();
assertEquals("Message log size not as expected.", 1, logs.size());
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java Sat Mar 8 00:48:50 2014
@@ -23,9 +23,9 @@ package org.apache.qpid.server.logging.m
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.SystemLog;
import org.apache.qpid.server.logging.UnitTestMessageLogger;
import org.apache.qpid.server.logging.subjects.TestBlankSubject;
import org.apache.qpid.server.util.BrokerTestHelper;
@@ -39,6 +39,7 @@ public abstract class AbstractTestMessag
protected LogMessage _logMessage = null;
protected UnitTestMessageLogger _logger;
protected LogSubject _logSubject = new TestBlankSubject();
+ private EventLogger _eventLogger;
@Override
public void setUp() throws Exception
@@ -47,7 +48,7 @@ public abstract class AbstractTestMessag
BrokerTestHelper.setUp();
_logger = new UnitTestMessageLogger();
- SystemLog.setRootMessageLogger(_logger);
+ _eventLogger = new EventLogger(_logger);
}
@Override
@@ -67,6 +68,10 @@ public abstract class AbstractTestMessag
_logger.clearLogMessages();
}
+ public EventLogger getEventLogger()
+ {
+ return _eventLogger;
+ }
protected List<Object> performLog()
{
@@ -74,7 +79,7 @@ public abstract class AbstractTestMessag
{
throw new NullPointerException("LogMessage has not been set");
}
- SystemLog.message(_logSubject, _logMessage);
+ _eventLogger.message(_logSubject, _logMessage);
return _logger.getLogMessages();
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java Sat Mar 8 00:48:50 2014
@@ -32,7 +32,7 @@ public class ExchangeMessagesTest extend
{
public void testExchangeCreated_Transient() throws Exception
{
- ExchangeImpl exchange = BrokerTestHelper.createExchange("test", false);
+ ExchangeImpl exchange = BrokerTestHelper.createExchange("test", false, getEventLogger());
String type = exchange.getTypeName();
String name = exchange.getName();
@@ -47,7 +47,7 @@ public class ExchangeMessagesTest extend
public void testExchangeCreated_Persistent() throws Exception
{
- ExchangeImpl exchange = BrokerTestHelper.createExchange("test", true);
+ ExchangeImpl exchange = BrokerTestHelper.createExchange("test", true, getEventLogger());
String type = exchange.getTypeName();
String name = exchange.getName();
@@ -72,7 +72,7 @@ public class ExchangeMessagesTest extend
public void testExchangeDiscardedMessage() throws Exception
{
- ExchangeImpl exchange = BrokerTestHelper.createExchange("test", false);
+ ExchangeImpl exchange = BrokerTestHelper.createExchange("test", false, getEventLogger());
final String name = exchange.getName();
final String routingKey = "routingKey";
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java Sat Mar 8 00:48:50 2014
@@ -22,9 +22,9 @@ package org.apache.qpid.server.logging.s
import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.SystemLog;
import org.apache.qpid.server.logging.UnitTestMessageLogger;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.util.BrokerTestHelper;
@@ -71,9 +71,9 @@ public abstract class AbstractTestLogSub
}
UnitTestMessageLogger logger = new UnitTestMessageLogger(statusUpdatesEnabled);
- SystemLog.setRootMessageLogger(logger);
+ EventLogger eventLogger = new EventLogger(logger);
- SystemLog.message(_subject, new LogMessage()
+ eventLogger.message(_subject, new LogMessage()
{
public String toString()
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java Sat Mar 8 00:48:50 2014
@@ -63,7 +63,7 @@ public class ConfiguredObjectStateTransi
when(_broker.getTaskExecutor()).thenReturn(executor);
_recovererProvider = new DefaultRecovererProvider(statisticsGatherer, _broker.getVirtualHostRegistry(),
- _broker.getLogRecorder(), _broker.getRootMessageLogger(), executor, new BrokerOptions(), mock(StoreConfigurationChangeListener.class));
+ _broker.getLogRecorder(), _broker.getEventLogger(), executor, new BrokerOptions(), mock(StoreConfigurationChangeListener.class));
_store = mock(ConfigurationEntryStore.class);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java Sat Mar 8 00:48:50 2014
@@ -37,6 +37,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.exchange.DefaultExchangeFactory;
import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.plugin.ExchangeType;
@@ -69,6 +70,7 @@ public class AMQQueueFactoryTest extends
VirtualHostConfiguration vhostConfig = mock(VirtualHostConfiguration.class);
when(_virtualHost.getConfiguration()).thenReturn(vhostConfig);
+ when(_virtualHost.getEventLogger()).thenReturn(new EventLogger());
_queueConfiguration = mock(QueueConfiguration.class);
when(vhostConfig.getQueueConfiguration(anyString())).thenReturn(_queueConfiguration);
DurableConfigurationStore store = mock(DurableConfigurationStore.class);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java Sat Mar 8 00:48:50 2014
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import junit.framework.TestCase;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.ServerMessage;
@@ -56,7 +57,7 @@ public class ConflationQueueListTest ext
queueAttributes.put(Queue.LVQ_KEY, CONFLATION_KEY);
final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
-
+ when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
_queue = new ConflationQueue(virtualHost, queueAttributes);
_list = (ConflationQueueList) _queue.getEntries();
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java Sat Mar 8 00:48:50 2014
@@ -23,6 +23,7 @@ package org.apache.qpid.server.queue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
@@ -55,6 +56,7 @@ public class PriorityQueueListTest exten
queueAttributes.put(Queue.PRIORITIES, 10);
final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
+ when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
PriorityQueue queue = new PriorityQueue(virtualHost, queueAttributes);
_list = (PriorityQueueList) queue.getEntries();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java Sat Mar 8 00:48:50 2014
@@ -20,6 +20,7 @@ package org.apache.qpid.server.queue;
import junit.framework.TestCase;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
@@ -196,6 +197,7 @@ public abstract class QueueEntryImplTest
queueAttributes.put(Queue.NAME, getName());
final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
+ when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
StandardQueue queue = new StandardQueue(virtualHost, queueAttributes);
OrderedQueueEntryList queueEntryList = (OrderedQueueEntryList) queue.getEntries();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java Sat Mar 8 00:48:50 2014
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.queue;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.Queue;
@@ -46,7 +47,7 @@ public class SimpleQueueEntryImplTest ex
queueAttributes.put(Queue.NAME, "SimpleQueueEntryImplTest");
final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
-
+ when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
StandardQueue queue = new StandardQueue(virtualHost, queueAttributes);
queueEntryList = (OrderedQueueEntryList) queue.getEntries();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java Sat Mar 8 00:48:50 2014
@@ -21,11 +21,13 @@ package org.apache.qpid.server.queue;
import java.util.Collections;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.virtualhost.VirtualHost;
import java.util.Arrays;
@@ -83,8 +85,8 @@ public class SortedQueueEntryListTest ex
// Create test list
final VirtualHost virtualHost = mock(VirtualHost.class);
- when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
-
+ when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
+ when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
_testQueue = new SortedQueue(virtualHost, attributes, new QueueEntryListFactory()
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java Sat Mar 8 00:48:50 2014
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
@@ -55,7 +56,7 @@ public class SortedQueueEntryTest extend
final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
-
+ when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
SortedQueue queue = new SortedQueue(virtualHost, attributes, new QueueEntryListFactory()
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java Sat Mar 8 00:48:50 2014
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.queue;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.Queue;
@@ -52,7 +53,8 @@ public class StandardQueueEntryListTest
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
final VirtualHost virtualHost = mock(VirtualHost.class);
- when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
+ when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
+ when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
_testQueue = new StandardQueue(virtualHost, queueAttributes);
_sqel = (StandardQueueEntryList) _testQueue.getEntries();
@@ -98,6 +100,7 @@ public class StandardQueueEntryListTest
queueAttributes.put(Queue.NAME, getName());
final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
+ when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
StandardQueue queue = new StandardQueue(virtualHost, queueAttributes);
return (StandardQueueEntryList) queue.getEntries();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Sat Mar 8 00:48:50 2014
@@ -40,6 +40,7 @@ import org.apache.commons.configuration.
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.model.ExclusivityPolicy;
import org.apache.qpid.server.model.LifetimePolicy;
@@ -114,6 +115,7 @@ public abstract class AbstractDurableCon
when(_exchange.getId()).thenReturn(_exchangeId);
when(_exchange.getExchangeType()).thenReturn(mock(ExchangeType.class));
+ when(_exchange.getEventLogger()).thenReturn(new EventLogger());
when(_configuration.getString(eq(MessageStoreConstants.ENVIRONMENT_PATH_PROPERTY), anyString())).thenReturn(
_storePath);
when(_virtualHost.getAttribute(eq(VirtualHost.STORE_PATH))).thenReturn(_storePath);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java Sat Mar 8 00:48:50 2014
@@ -19,24 +19,27 @@ package org.apache.qpid.server.store;
import java.util.ArrayList;
import java.util.List;
import junit.framework.TestCase;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.RootMessageLogger;
-import org.apache.qpid.server.logging.SystemLog;
+import org.apache.qpid.server.logging.MessageLogger;
import org.apache.qpid.server.logging.messages.ConfigStoreMessages;
import org.apache.qpid.server.logging.messages.MessageStoreMessages;
import org.apache.qpid.server.logging.messages.TransactionLogMessages;
+import static org.mockito.Mockito.mock;
+
public class OperationalLoggingListenerTest extends TestCase
{
public static final String STORE_LOCATION = "The moon!";
+ private EventLogger _eventLogger;
protected void setUp() throws Exception
{
super.setUp();
-
+ _eventLogger = new EventLogger();
}
public void testOperationalLoggingWithStoreLocation() throws Exception
@@ -44,7 +47,7 @@ public class OperationalLoggingListenerT
TestMessageStore messageStore = new TestMessageStore();
LogSubject logSubject = LOG_SUBJECT;
- OperationalLoggingListener.listen(messageStore, logSubject);
+ OperationalLoggingListener.listen(messageStore, logSubject, _eventLogger);
performTests(messageStore, true);
@@ -55,7 +58,7 @@ public class OperationalLoggingListenerT
TestMessageStore messageStore = new TestMessageStore();
LogSubject logSubject = LOG_SUBJECT;
- OperationalLoggingListener.listen(messageStore, logSubject);
+ OperationalLoggingListener.listen(messageStore, logSubject, _eventLogger);
performTests(messageStore, false);
}
@@ -64,7 +67,7 @@ public class OperationalLoggingListenerT
{
final List<LogMessage> messages = new ArrayList<LogMessage>();
- SystemLog.setRootMessageLogger(new TestRootLogger(messages));
+ _eventLogger.setMessageLogger(new TestLogger(messages));
if(setStoreLocation)
{
@@ -146,11 +149,11 @@ public class OperationalLoggingListenerT
}
}
- private static class TestRootLogger implements RootMessageLogger
+ private static class TestLogger implements MessageLogger
{
private final List<LogMessage> _messages;
- private TestRootLogger(final List<LogMessage> messages)
+ private TestLogger(final List<LogMessage> messages)
{
_messages = messages;
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java Sat Mar 8 00:48:50 2014
@@ -32,6 +32,7 @@ import java.util.UUID;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.protocol.AMQSessionModel;
@@ -67,8 +68,9 @@ public class BrokerTestHelper
when(broker.getAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD)).thenReturn(10000l);
when(broker.getId()).thenReturn(UUID.randomUUID());
when(broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(subjectCreator);
- when(broker.getVirtualHostRegistry()).thenReturn(new VirtualHostRegistry());
+ when(broker.getVirtualHostRegistry()).thenReturn(new VirtualHostRegistry(new EventLogger()));
when(broker.getSecurityManager()).thenReturn(new SecurityManager(mock(Broker.class), false));
+ when(broker.getEventLogger()).thenReturn(new EventLogger());
return broker;
}
@@ -107,7 +109,8 @@ public class BrokerTestHelper
public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration) throws Exception
{
- return createVirtualHost(virtualHostConfiguration, null);
+
+ return createVirtualHost(virtualHostConfiguration, new VirtualHostRegistry(new EventLogger()));
}
public static VirtualHost createVirtualHost(String name, VirtualHostRegistry virtualHostRegistry) throws Exception
@@ -160,12 +163,13 @@ public class BrokerTestHelper
return connection;
}
- public static ExchangeImpl createExchange(String hostName, final boolean durable) throws Exception
+ public static ExchangeImpl createExchange(String hostName, final boolean durable, final EventLogger eventLogger) throws Exception
{
SecurityManager securityManager = new SecurityManager(mock(Broker.class), false);
VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getName()).thenReturn(hostName);
when(virtualHost.getSecurityManager()).thenReturn(securityManager);
+ when(virtualHost.getEventLogger()).thenReturn(eventLogger);
DefaultExchangeFactory factory = new DefaultExchangeFactory(virtualHost);
Map<String,Object> attributes = new HashMap<String, Object>();
attributes.put(org.apache.qpid.server.model.Exchange.ID, UUIDGenerator.generateExchangeUUID("amp.direct", virtualHost.getName()));
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java Sat Mar 8 00:48:50 2014
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.UUID;
import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.exchange.DirectExchange;
@@ -179,7 +180,7 @@ public class DurableConfigurationRecover
}
_durableConfigurationRecoverer =
new DurableConfigurationRecoverer(_vhost.getName(), recovererMap,
- new DefaultUpgraderProvider(_vhost, _exchangeRegistry));
+ new DefaultUpgraderProvider(_vhost, _exchangeRegistry), new EventLogger());
_store = mock(DurableConfigurationStore.class);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Sat Mar 8 00:48:50 2014
@@ -27,6 +27,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.connection.IConnectionRegistry;
import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.plugin.ExchangeType;
@@ -363,4 +364,10 @@ public class MockVirtualHost implements
{
return null;
}
+
+ @Override
+ public EventLogger getEventLogger()
+ {
+ return null;
+ }
}
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java Sat Mar 8 00:48:50 2014
@@ -20,16 +20,20 @@
*/
package org.apache.qpid.server.security.access.config;
+import org.apache.qpid.server.logging.EventLogger;
+
import java.io.File;
public abstract class AbstractConfiguration implements ConfigurationFile
{
private File _file;
private RuleSet _config;
-
- public AbstractConfiguration(File file)
+ private final EventLogger _eventLogger;
+
+ public AbstractConfiguration(File file, final EventLogger eventLogger)
{
_file = file;
+ _eventLogger = eventLogger;
}
public File getFile()
@@ -39,7 +43,7 @@ public abstract class AbstractConfigurat
public RuleSet load()
{
- _config = new RuleSet();
+ _config = new RuleSet(_eventLogger);
return _config;
}
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java Sat Mar 8 00:48:50 2014
@@ -35,6 +35,7 @@ import java.util.Stack;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.security.access.ObjectType;
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.security.access.Permission;
@@ -67,9 +68,9 @@ public class PlainConfiguration extends
private StreamTokenizer _st;
- public PlainConfiguration(File file)
+ public PlainConfiguration(File file, final EventLogger eventLogger)
{
- super(file);
+ super(file, eventLogger);
}
@Override
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java?rev=1575462&r1=1575461&r2=1575462&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java Sat Mar 8 00:48:50 2014
@@ -38,7 +38,7 @@ import javax.security.auth.Subject;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.logging.SystemLog;
+import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.AccessControlMessages;
import org.apache.qpid.server.security.Result;
import org.apache.qpid.server.security.access.ObjectProperties;
@@ -70,9 +70,11 @@ public class RuleSet
private final Map<Subject, Map<Operation, Map<ObjectType, List<Rule>>>> _cache =
new WeakHashMap<Subject, Map<Operation, Map<ObjectType, List<Rule>>>>();
private final Map<String, Boolean> _config = new HashMap<String, Boolean>();
+ private final EventLogger _eventLogger;
- public RuleSet()
+ public RuleSet(EventLogger eventLogger)
{
+ _eventLogger = eventLogger;
// set some default configuration properties
configure(DEFAULT_DENY, Boolean.TRUE);
}
@@ -321,14 +323,14 @@ public class RuleSet
switch (permission)
{
case ALLOW_LOG:
- SystemLog.message(AccessControlMessages.ALLOWED(
+ _eventLogger.message(AccessControlMessages.ALLOWED(
action.getOperation().toString(),
action.getObjectType().toString(),
action.getProperties().toString()));
case ALLOW:
return Result.ALLOWED;
case DENY_LOG:
- SystemLog.message(AccessControlMessages.DENIED(
+ _eventLogger.message(AccessControlMessages.DENIED(
action.getOperation().toString(),
action.getObjectType().toString(),
action.getProperties().toString()));
@@ -437,4 +439,9 @@ public class RuleSet
}
return objects;
}
+
+ public EventLogger getEventLogger()
+ {
+ return _eventLogger;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org