leosimons 01/04/22 10:03:11
Modified: proposal/4.0/src/java/org/apache/phoenix/engine
PhoenixEmbeddor.java PhoenixKernel.java
proposal/4.0/src/java/org/apache/phoenix/engine/facilities
ManagerImpl.java
Log:
making sure everything makes proper use of AbstractLoggable
Revision Changes Path
1.8 +25 -20
jakarta-avalon-phoenix/proposal/4.0/src/java/org/apache/phoenix/engine/PhoenixEmbeddor.java
Index: PhoenixEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/proposal/4.0/src/java/org/apache/phoenix/engine/PhoenixEmbeddor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PhoenixEmbeddor.java 2001/04/22 10:07:12 1.7
+++ PhoenixEmbeddor.java 2001/04/22 17:03:08 1.8
@@ -34,6 +34,7 @@
import org.apache.framework.lifecycle.Disposable;
import org.apache.framework.CascadingException;
+import org.apache.framework.CascadingThrowable;
import org.apache.avalon.camelot.Container;
import org.apache.avalon.camelot.CamelotUtil;
@@ -56,12 +57,6 @@
/**
*
- * TODO:
- * - improve exception handling, implement Reconfigurable and Recontextualizable.
- * - figure out if run() can be better than it is now; I'm not entirely at home
- * with threading stuff.
- * - fix imports.
- *
* @author <a href="mailto:[EMAIL PROTECTED]">Federico Barbieri</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="[EMAIL PROTECTED]">Leo Simons</a>
@@ -72,7 +67,6 @@
private Parameters parameters;
private Disposable runner;
- private Logger logger;
private Deployer deployer;
private DefaultContext deployerContext;
private Manager manager;
@@ -160,6 +154,8 @@
*/
public void start() throws StartException
{
+ try
+ {
// setup core handler components
this.setupComponents();
// deploy facilities and applications
@@ -167,7 +163,8 @@
kernel.start();
- logger.info("...Phoenix started.");
+
getLogger().info("==============================================================");
+ getLogger().info("...Phoenix started.");
// loop until <code>Shutdown</code> is created.
while( !this.shutdown )
{
@@ -179,6 +176,14 @@
}
// we can shut everything down now...
handleShutdown();
+ }
+ catch( StartException se )
+ {
+ if( getLogger() != null )
+ getLogger().fatalError( "Problem running embeddor", se );
+
+ throw se;
+ }
}
/**
@@ -201,16 +206,16 @@
private void createComponents() throws InitializationException
{
try { this.createLogger(); }
- catch( Exception e ) { logger.fatalError( "Unable to create logger!", e );
+ catch( Exception e ) { getLogger().fatalError( "Unable to create logger!",
e );
throw new InitializationException( "Unable to
create logger!", e ); }
try { this.createDeployer(); }
- catch( Exception e ) { logger.fatalError( "Unable to create deployer!", e );
+ catch( Exception e ) { getLogger().fatalError( "Unable to create
deployer!", e );
throw new InitializationException( "Unable to create
deployer!", e ); }
try { this.createManager(); }
- catch( Exception e ) { logger.fatalError( "Unable to create manager!", e );
+ catch( Exception e ) { getLogger().fatalError( "Unable to create manager!",
e );
throw new InitializationException( "Unable to create
manager!", e ); }
try { this.createKernel(); }
- catch( Exception e ) { logger.fatalError( "Unable to create kernel!", e );
+ catch( Exception e ) { getLogger().fatalError( "Unable to create kernel!",
e );
throw new InitializationException( "Unable to create
kernel!", e ); }
}
/**
@@ -221,16 +226,17 @@
try { this.setupLogger(); }
catch( Exception e ) { throw new StartException( "Unable to setup
logger!", e ); }
- logger.info("Starting Phoenix...");
+ getLogger().info("Starting Phoenix...");
+
getLogger().info("==============================================================");
try { this.setupDeployer(); }
- catch( Exception e ) { logger.fatalError( "Unable to setup deployer!", e );
+ catch( Exception e ) { getLogger().fatalError( "Unable to setup
deployer!", e );
throw new StartException( "Unable to setup
deployer!",e ); }
try { this.setupManager(); }
- catch( Exception e ) { logger.fatalError( "Unable to setup manager!", e );
+ catch( Exception e ) { getLogger().fatalError( "Unable to setup manager!",
e );
throw new StartException( "Unable to setup
manager!",e ); }
try { this.setupKernel(); }
- catch( Exception e ) { logger.fatalError( "Unable to setup kernel!", e );
+ catch( Exception e ) { getLogger().fatalError( "Unable to setup kernel!",
e );
throw new StartException( "Unable to setup
kernel!",e ); }
}
/**
@@ -253,8 +259,8 @@
logTarget.setFormatter( formatter );
LogKit.addLogTarget( logDest, logTarget );
- this.logger = LogKit.createLogger( LogKit.createCategory( "Phoenix",
Priority.DEBUG ),
- new LogTarget[] { logTarget } );
+ setLogger( LogKit.createLogger( LogKit.createCategory( "Phoenix",
Priority.INFO ),
+ new LogTarget[] { logTarget } ) );
}
catch( final Exception e )
{
@@ -477,9 +483,8 @@
}
catch( Exception e )
{
- this.logger.error( "There was an error while attempting to shut down
phoenix", e );
+ getLogger().error( "There was an error while attempting to shut down
phoenix", e );
}
- logger = null;
System.out.print(".");
this.runner.dispose();
this.runner = null;
1.7 +2 -1
jakarta-avalon-phoenix/proposal/4.0/src/java/org/apache/phoenix/engine/PhoenixKernel.java
Index: PhoenixKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/proposal/4.0/src/java/org/apache/phoenix/engine/PhoenixKernel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PhoenixKernel.java 2001/04/22 10:07:13 1.6
+++ PhoenixKernel.java 2001/04/22 17:03:09 1.7
@@ -118,7 +118,8 @@
}
catch( Exception e )
{
- this.logger.error( "There was an error adding "+name+" to the JMX
Manager", e );
+ if( this.logger != null )
+ this.logger.error( "There was an error adding "+name+" to the JMX
Manager", e );
}
super.add( name, entry );
1.5 +18 -21
jakarta-avalon-phoenix/proposal/4.0/src/java/org/apache/phoenix/engine/facilities/ManagerImpl.java
Index: ManagerImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/proposal/4.0/src/java/org/apache/phoenix/engine/facilities/ManagerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ManagerImpl.java 2001/04/19 14:18:33 1.4
+++ ManagerImpl.java 2001/04/22 17:03:10 1.5
@@ -26,6 +26,7 @@
import org.apache.avalon.camelot.Deployer;
import org.apache.log.Logger;
+import org.apache.framework.logger.AbstractLoggable;
import org.apache.jmx.introspector.DynamicMBeanFactory;
import org.apache.jmx.adaptor.RMIAdaptor;
@@ -35,7 +36,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leo Simons</a>
*/
-public class ManagerImpl implements Manager
+public class ManagerImpl extends AbstractLoggable implements Manager
{
private MBeanServer mBeanServer;
private Logger logger;
@@ -56,40 +57,36 @@
/////////////////////////
/// LIFECYCLE METHODS ///
/////////////////////////
- public void setLogger( Logger logger )
- {
- this.logger = logger;
- }
public void contextualize( Context context ) throws ContextException
{
try { this.mBeanServer = (MBeanServer)context.get(
"javax.management.MBeanServer" ); }
catch( Exception e ) {
- logger.error( "Invalid context - no MBeanServer supplied", e );
+ getLogger().error( "Invalid context - no MBeanServer supplied", e );
throw new ContextException( "Invalid context - no MBeanServer
supplied", e ); }
try { this.embeddor = (Embeddor)context.get(
"org.apache.framework.atlantis.core.Embeddor" ); }
catch( Exception e ) {
- logger.error( "Invalid context - no Embeddor supplied", e );
+ getLogger().error( "Invalid context - no Embeddor supplied", e );
throw new ContextException( "Invalid context - no Embeddor supplied", e
); }
try { this.kernel = (Kernel)context.get(
"org.apache.framework.atlantis.core.Kernel" ); }
catch( Exception e ) {
- logger.error( "Invalid context - no Kernel supplied", e );
+ getLogger().error( "Invalid context - no Kernel supplied", e );
throw new ContextException( "Invalid context - no Kernel supplied", e
); }
try { this.deployer = (Deployer)context.get(
"org.apache.avalon.camelot.Deployer" ); }
catch( Exception e ) {
- logger.error( "Invalid context - no Deployer supplied", e );
+ getLogger().error( "Invalid context - no Deployer supplied", e );
throw new ContextException( "Invalid context - no Deployer supplied", e
); }
try { this.registryPort = (new Integer((String)context.get(
"java.rmi.registry.port" ))).intValue(); }
catch( Exception e ) {
- logger.error( "Invalid context - no port for RMI Registry supplied", e
);
+ getLogger().error( "Invalid context - no port for RMI Registry
supplied", e );
throw new ContextException( "Invalid context - no port for RMI Registry
supplied", e ); }
try { this.computerName = (String)context.get( "java.rmi.registry.name" ); }
catch( Exception e ) {
- logger.error( "Invalid context - no computer name for RMI Adaptor
supplied", e );
+ getLogger().error( "Invalid context - no computer name for RMI Adaptor
supplied", e );
throw new ContextException( "Invalid context - no computer name for RMI
Adaptor supplied", e ); }
try { this.adaptorName = (String)context.get( "org.apache.jmx.adaptor.name"
); }
catch( Exception e ) {
- logger.error( "Invalid context - no name for RMI Adaptor supplied", e );
+ getLogger().error( "Invalid context - no name for RMI Adaptor
supplied", e );
throw new ContextException( "Invalid context - no name for RMI Adaptor
supplied", e ); }
this.registryString = "//"+computerName+":"+registryPort+"/"+adaptorName;
}
@@ -101,28 +98,28 @@
DynamicMBeanFactory.create( embeddor ),
new ObjectName( "Embeddor" ) );
}
- catch( Exception e ) { logger.error( "Unable to register MBean for
Embeddor", e ); }
+ catch( Exception e ) { getLogger().error( "Unable to register MBean for
Embeddor", e ); }
try
{
mBeanServer.registerMBean(
DynamicMBeanFactory.create( deployer ),
new ObjectName( "Deployer" ) );
}
- catch( Exception e ) { logger.error( "Unable to register MBean for
Deployer", e ); }
+ catch( Exception e ) { getLogger().error( "Unable to register MBean for
Deployer", e ); }
try
{
mBeanServer.registerMBean(
DynamicMBeanFactory.create( kernel ),
new ObjectName( "Kernel" ) );
}
- catch( Exception e ) { logger.error( "Unable to register MBean for Kernel",
e ); }
+ catch( Exception e ) { getLogger().error( "Unable to register MBean for
Kernel", e ); }
try
{
mBeanServer.registerMBean(
DynamicMBeanFactory.create( logger ),
new ObjectName( "Logger" ) );
}
- catch( Exception e ) { logger.error( "Unable to register MBean for Logger",
e ); }
+ catch( Exception e ) { getLogger().error( "Unable to register MBean for
Logger", e ); }
// create a RMI adaptor for the MBeanServer and expose it
try
@@ -133,7 +130,7 @@
this.rmiRegistry = LocateRegistry.createRegistry( registryPort );
Naming.bind(this.registryString, this.adaptor);
}
- catch( Exception e ) { logger.error( "Unable to bind JMX RMI Adaptor", e );
}
+ catch( Exception e ) { getLogger().error( "Unable to bind JMX RMI Adaptor",
e ); }
}
public void stop() throws StopException
{
@@ -146,8 +143,8 @@
}
catch( Exception e )
{
- if( logger != null )
- logger.error( "error unregistering MBeans", e );
+ if( getLogger() != null )
+ getLogger().error( "error unregistering MBeans", e );
}
try
{
@@ -155,8 +152,8 @@
}
catch( Exception e )
{
- if( logger != null )
- logger.error( "Unable to unbind JMX RMI Adaptor", e );
+ if( getLogger() != null )
+ getLogger().error( "Unable to unbind JMX RMI Adaptor", e );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
