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/12/06 23:13:58 UTC
svn commit: r1643619 - in
/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server:
Broker.java registry/ApplicationRegistry.java
registry/IApplicationRegistry.java
Author: rgodfrey
Date: Sat Dec 6 22:13:57 2014
New Revision: 1643619
URL: http://svn.apache.org/r1643619
Log:
QPID-6263 : [Java Broker] remove ApplicationRegistry
Removed:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java?rev=1643619&r1=1643618&r2=1643619&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java Sat Dec 6 22:13:57 2014
@@ -33,33 +33,45 @@ import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.qpid.common.QpidProperties;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
+import org.apache.qpid.server.logging.CompositeStartupMessageLogger;
import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.Log4jMessageLogger;
import org.apache.qpid.server.logging.LogRecorder;
+import org.apache.qpid.server.logging.MessageLogger;
import org.apache.qpid.server.logging.SystemOutMessageLogger;
import org.apache.qpid.server.logging.log4j.LoggingManagementFacade;
import org.apache.qpid.server.logging.messages.BrokerMessages;
import org.apache.qpid.server.model.BrokerShutdownProvider;
+import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.plugin.PluggableFactoryLoader;
import org.apache.qpid.server.plugin.SystemConfigFactory;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.registry.IApplicationRegistry;
import org.apache.qpid.server.security.SecurityManager;
+import org.apache.qpid.server.store.BrokerStoreUpgraderAndRecoverer;
import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.util.SystemUtils;
public class Broker implements BrokerShutdownProvider
{
private static final Logger LOGGER = Logger.getLogger(Broker.class);
private volatile Thread _shutdownHookThread;
- private volatile IApplicationRegistry _applicationRegistry;
private EventLogger _eventLogger;
private boolean _configuringOwnLogging = false;
private final TaskExecutor _taskExecutor = new TaskExecutorImpl();
private final boolean _exitJVMOnShutdownWithNonZeroExitCode;
+ private SystemConfig _systemConfig;
+
+ private org.apache.qpid.server.model.Broker _broker;
+
+ private DurableConfigurationStore _store;
+
+
public Broker()
{
this(false);
@@ -96,10 +108,22 @@ public class Broker implements BrokerShu
{
try
{
- if (_applicationRegistry != null)
+ try
+ {
+ if (_broker != null)
+ {
+ _broker.close();
+ }
+ }
+ finally
{
- _applicationRegistry.close();
+ if(_systemConfig != null)
+ {
+ _systemConfig.close();
+ }
}
+ _store = null;
+ _broker = null;
_taskExecutor.stop();
}
@@ -169,21 +193,67 @@ public class Broker implements BrokerShu
LogRecorder logRecorder = new LogRecorder();
_taskExecutor.start();
- SystemConfig systemConfig = configFactory.newInstance(_taskExecutor, _eventLogger, logRecorder, options, this);
- systemConfig.open();
- DurableConfigurationStore store = systemConfig.getConfigurationStore();
+ _systemConfig = configFactory.newInstance(_taskExecutor, _eventLogger, logRecorder, options, this);
+ _systemConfig.open();
+ _store = _systemConfig.getConfigurationStore();
- _applicationRegistry = new ApplicationRegistry(store, systemConfig);
try
{
- _applicationRegistry.initialise(options);
+ // Create the RootLogger to be used during broker operation
+ boolean statusUpdatesEnabled = Boolean.parseBoolean(System.getProperty(BrokerProperties.PROPERTY_STATUS_UPDATES, "true"));
+ MessageLogger messageLogger = new Log4jMessageLogger(statusUpdatesEnabled);
+ final EventLogger eventLogger = _systemConfig.getEventLogger();
+ eventLogger.setMessageLogger(messageLogger);
+
+ //Create the composite (log4j+SystemOut MessageLogger to be used during startup
+ MessageLogger[] messageLoggers = {new SystemOutMessageLogger(), messageLogger};
+
+ CompositeStartupMessageLogger startupMessageLogger = new CompositeStartupMessageLogger(messageLoggers);
+ EventLogger startupLogger = new EventLogger(startupMessageLogger);
+
+ startupLogger.message(BrokerMessages.STARTUP(QpidProperties.getReleaseVersion(),
+ QpidProperties.getBuildVersion()));
+
+ startupLogger.message(BrokerMessages.PLATFORM(System.getProperty("java.vendor"),
+ System.getProperty("java.runtime.version",
+ System.getProperty("java.version")),
+ SystemUtils.getOSName(),
+ SystemUtils.getOSVersion(),
+ SystemUtils.getOSArch()));
+
+ startupLogger.message(BrokerMessages.MAX_MEMORY(Runtime.getRuntime().maxMemory()));
+
+ BrokerStoreUpgraderAndRecoverer upgrader = new BrokerStoreUpgraderAndRecoverer(_systemConfig);
+ org.apache.qpid.server.model.Broker broker = upgrader.perform(_store);
+ _broker = broker;
+
+ broker.setEventLogger(startupLogger);
+ broker.open();
+
+ if (broker.getState() == State.ACTIVE)
+ {
+ startupLogger.message(BrokerMessages.READY());
+ broker.setEventLogger(eventLogger);
+ }
}
catch(Exception e)
{
LOGGER.fatal("Exception during startup", e);
try
{
- _applicationRegistry.close();
+ try
+ {
+ if (_broker != null)
+ {
+ _broker.close();
+ }
+ }
+ finally
+ {
+ _systemConfig.close();
+ }
+ _store = null;
+ _broker = null;
}
catch(Exception ce)
{
@@ -297,15 +367,6 @@ public class Broker implements BrokerShu
}
}
- public org.apache.qpid.server.model.Broker getBroker()
- {
- if (_applicationRegistry == null)
- {
- return null;
- }
- return _applicationRegistry.getBroker();
- }
-
private class ShutdownService implements Runnable
{
public void run()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org