You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by ri...@apache.org on 2006/11/02 16:30:37 UTC
svn commit: r470408 - in
/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb: OB/ OCI/IIOP/
Author: rickmcguire
Date: Thu Nov 2 08:30:36 2006
New Revision: 470408
URL: http://svn.apache.org/viewvc?view=rev&rev=470408
Log:
YOKO-200 Improve the logging in the acceptor and connector classes.
Modified:
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/AccFactory_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConFactoryInfo_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConFactory_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java?view=diff&rev=470408&r1=470407&r2=470408
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java Thu Nov 2 08:30:36 2006
@@ -24,7 +24,7 @@
public class Logger_impl extends org.omg.CORBA.LocalObject implements WLogger {
// the real logger backing instance.
- static final Logger logger = Logger.getLogger(ORBInstance.class .getName());
+ static final Logger logger = Logger.getLogger(ORBInstance.class.getName());
// ------------------------------------------------------------------
// Standard IDL to Java Mapping
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/AccFactory_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/AccFactory_impl.java?view=diff&rev=470408&r1=470407&r2=470408
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/AccFactory_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/AccFactory_impl.java Thu Nov 2 08:30:36 2006
@@ -16,10 +16,16 @@
package org.apache.yoko.orb.OCI.IIOP;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.apache.yoko.orb.OCI.IIOP.PLUGIN_ID;
final class AccFactory_impl extends org.omg.CORBA.LocalObject implements
org.apache.yoko.orb.OCI.AccFactory {
+
+ // the real logger backing instance. We use the interface class as the locator
+ static final Logger logger = Logger.getLogger(org.apache.yoko.orb.OCI.AccFactory.class.getName());
//
// AccFactory information
//
@@ -144,12 +150,16 @@
hosts[0] = org.apache.yoko.orb.OB.Net.getCanonicalHostname(numeric);
}
- if (bind == null)
+ logger.fine("Creating acceptor for port=" + port);
+
+ if (bind == null) {
return new Acceptor_impl(hosts, multiProfile, port, backlog,
keepAlive, connectionHelper_, listenMap_);
- else
+ }
+ else {
return new Acceptor_impl(bind, hosts, multiProfile, port, backlog,
keepAlive, connectionHelper_, listenMap_);
+ }
}
public void change_key(org.omg.IOP.IORHolder ior, byte[] key) {
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java?view=diff&rev=470408&r1=470407&r2=470408
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java Thu Nov 2 08:30:36 2006
@@ -16,11 +16,17 @@
package org.apache.yoko.orb.OCI.IIOP;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.apache.yoko.orb.CORBA.OutputStream;
import org.apache.yoko.orb.OCI.IIOP.PLUGIN_ID;
final class Acceptor_impl extends org.omg.CORBA.LocalObject implements
org.apache.yoko.orb.OCI.Acceptor {
+ // the real logger backing instance. We use the interface class as the locator
+ static final Logger logger = Logger.getLogger(org.apache.yoko.orb.OCI.Acceptor.class.getName());
+
// Some data members must not be private because the info object
// must be able to access them
public String[] hosts_; // The hosts
@@ -58,6 +64,7 @@
}
public void close() {
+ logger.fine("Closing connection to host=" + localAddress_ + ", port=" + port_);
//
// Destroy the info object
//
@@ -99,18 +106,23 @@
else
socket_.setSoTimeout(0);
+ logger.fine("Accepting connection for host=" + localAddress_ + ", port=" + port_);
socket = socket_.accept();
} catch (java.io.InterruptedIOException ex) {
if (!block)
return null; // Timeout
- else
+ else {
+ logger.log(Level.SEVERE, "Failure accepting connection for host=" + localAddress_ + ", port=" + port_, ex);
+
throw new org.omg.CORBA.COMM_FAILURE(
org.apache.yoko.orb.OB.MinorCodes
.describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorAccept)
+ ": " + ex.toString(),
org.apache.yoko.orb.OB.MinorCodes.MinorAccept,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+ }
} catch (java.io.IOException ex) {
+ logger.log(Level.SEVERE, "Failure accepting connection for host=" + localAddress_ + ", port=" + port_, ex);
throw new org.omg.CORBA.COMM_FAILURE(
org.apache.yoko.orb.OB.MinorCodes
.describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorAccept)
@@ -127,6 +139,7 @@
if (keepAlive_)
socket.setKeepAlive(true);
} catch (java.net.SocketException ex) {
+ logger.log(Level.SEVERE, "Failure configuring server connection for host=" + localAddress_ + ", port=" + port_, ex);
throw new org.omg.CORBA.COMM_FAILURE(
org.apache.yoko.orb.OB.MinorCodes
.describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorSetsockopt)
@@ -174,6 +187,7 @@
try {
socket = connectionHelper_.createSelfConnection(localAddress_, port_);
} catch (java.net.ConnectException ex) {
+ logger.log(Level.SEVERE, "Failure making self connection for host=" + localAddress_ + ", port=" + port_, ex);
throw new org.omg.CORBA.TRANSIENT(
org.apache.yoko.orb.OB.MinorCodes
.describeTransient(org.apache.yoko.orb.OB.MinorCodes.MinorConnectFailed)
@@ -181,6 +195,7 @@
org.apache.yoko.orb.OB.MinorCodes.MinorConnectFailed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
} catch (java.io.IOException ex) {
+ logger.log(Level.SEVERE, "Failure making self connection for host=" + localAddress_ + ", port=" + port_, ex);
throw new org.omg.CORBA.COMM_FAILURE(
org.apache.yoko.orb.OB.MinorCodes
.describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorSocket)
@@ -195,6 +210,7 @@
try {
socket.setTcpNoDelay(true);
} catch (java.net.SocketException ex) {
+ logger.log(Level.SEVERE, "Failure configuring self connection for host=" + localAddress_ + ", port=" + port_, ex);
try {
socket.close();
} catch (java.io.IOException e) {
@@ -431,6 +447,7 @@
//
port_ = socket_.getLocalPort();
} catch (java.net.BindException ex) {
+ logger.log(Level.SEVERE, "Failure creating server socket for host=" + localAddress_ + ", port=" + port_, ex);
throw new org.omg.CORBA.COMM_FAILURE(
org.apache.yoko.orb.OB.MinorCodes
.describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorBind)
@@ -438,6 +455,7 @@
org.apache.yoko.orb.OB.MinorCodes.MinorBind,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
} catch (java.io.IOException ex) {
+ logger.log(Level.SEVERE, "Failure creating server socket for host=" + localAddress_ + ", port=" + port_, ex);
throw new org.omg.CORBA.COMM_FAILURE(
org.apache.yoko.orb.OB.MinorCodes
.describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorSocket)
@@ -494,6 +512,7 @@
//
port_ = socket_.getLocalPort();
} catch (java.net.BindException ex) {
+ logger.log(Level.SEVERE, "Failure creating server socket for host=" + localAddress_ + ", port=" + port_, ex);
throw new org.omg.CORBA.COMM_FAILURE(
org.apache.yoko.orb.OB.MinorCodes
.describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorBind)
@@ -501,6 +520,7 @@
org.apache.yoko.orb.OB.MinorCodes.MinorBind,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
} catch (java.io.IOException ex) {
+ logger.log(Level.SEVERE, "Failure creating server socket for host=" + localAddress_ + ", port=" + port_, ex);
throw new org.omg.CORBA.COMM_FAILURE(
org.apache.yoko.orb.OB.MinorCodes
.describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorSocket)
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConFactoryInfo_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConFactoryInfo_impl.java?view=diff&rev=470408&r1=470407&r2=470408
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConFactoryInfo_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConFactoryInfo_impl.java Thu Nov 2 08:30:36 2006
@@ -16,6 +16,9 @@
package org.apache.yoko.orb.OCI.IIOP;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.apache.yoko.orb.OCI.IIOP.ConFactoryInfo;
import org.apache.yoko.orb.OCI.IIOP.PLUGIN_ID;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConFactory_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConFactory_impl.java?view=diff&rev=470408&r1=470407&r2=470408
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConFactory_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConFactory_impl.java Thu Nov 2 08:30:36 2006
@@ -16,10 +16,16 @@
package org.apache.yoko.orb.OCI.IIOP;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.apache.yoko.orb.OCI.IIOP.PLUGIN_ID;
final class ConFactory_impl extends org.omg.CORBA.LocalObject implements
org.apache.yoko.orb.OCI.ConFactory {
+ // the real logger backing instance. We use the interface class as the locator
+ static final Logger logger = Logger.getLogger(org.apache.yoko.orb.OCI.ConFactory.class.getName());
+
private boolean keepAlive_; // The keepalive flag
private ConFactoryInfo_impl info_; // ConFactory info
@@ -136,6 +142,7 @@
port = (int) body.port;
org.apache.yoko.orb.OCI.ConnectCB[] cbs = info_
._OB_getConnectCBSeq();
+ logger.fine("Creating connector to host=" + body.host +", port=" + port);
seq.addElement(new Connector_impl(ior, policies, body.host, port, keepAlive_,
cbs, listenMap_, connectionHelper_));
@@ -178,6 +185,7 @@
//
org.apache.yoko.orb.OCI.ConnectCB[] ccbs = info_
._OB_getConnectCBSeq();
+ logger.fine("Creating alternate connector to host=" + host +", port=" + cport);
seq.addElement(new Connector_impl(ior, policies, host, cport,
keepAlive_, ccbs, listenMap_, connectionHelper_));
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java?view=diff&rev=470408&r1=470407&r2=470408
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java Thu Nov 2 08:30:36 2006
@@ -16,6 +16,9 @@
package org.apache.yoko.orb.OCI.IIOP;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.omg.IOP.IOR;
import org.omg.CORBA.Policy;
import org.apache.yoko.orb.OCI.IIOP.PLUGIN_ID;
@@ -23,6 +26,9 @@
final class Connector_impl extends org.omg.CORBA.LocalObject implements
org.apache.yoko.orb.OCI.Connector {
+ // the real logger backing instance. We use the interface class as the locator
+ static final Logger logger = Logger.getLogger(org.apache.yoko.orb.OCI.Connector.class.getName());
+
private IOR ior_; // the target IOR we're connecting with
private Policy[] policies_; // the policies used for the connection.
@@ -48,6 +54,7 @@
// ------------------------------------------------------------------
private void close() {
+ logger.fine("Closing connection to host=" + host_ + ", port=" + port_);
//
// Destroy the info object
//
@@ -99,8 +106,10 @@
// Create socket and connect
//
try {
+ logger.fine("Connecting to host=" + address + ", port=" + port_);
socket_ = connectionHelper_.createSocket(ior_, policies_, address, port_);
} catch (java.net.ConnectException ex) {
+ logger.log(Level.SEVERE, "Error connecting to host=" + address + ", port=" + port_, ex);
throw new org.omg.CORBA.TRANSIENT(
org.apache.yoko.orb.OB.MinorCodes
.describeTransient(org.apache.yoko.orb.OB.MinorCodes.MinorConnectFailed)
@@ -108,6 +117,7 @@
org.apache.yoko.orb.OB.MinorCodes.MinorConnectFailed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
} catch (java.io.IOException ex) {
+ logger.log(Level.SEVERE, "Error connecting to host=" + address + ", port=" + port_, ex);
throw new org.omg.CORBA.COMM_FAILURE(
org.apache.yoko.orb.OB.MinorCodes
.describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorSocket)