asmuts 2005/05/25 08:15:11
Modified: src/java/org/apache/jcs/auxiliary/lateral/javagroups
LateralJGReceiver.java JGConnectionHolder.java
LateralJGService.java LateralJGSender.java
src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils
JGSocketOpener.java
Log:
Added loggign , prevented dispatcher from being created when it will not be
used.
Revision Changes Path
1.7 +15 -4
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiver.java
Index: LateralJGReceiver.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LateralJGReceiver.java 20 May 2005 19:22:42 -0000 1.6
+++ LateralJGReceiver.java 25 May 2005 15:15:10 -0000 1.7
@@ -27,6 +27,7 @@
import org.jgroups.Channel;
import org.jgroups.ChannelNotConnectedException;
import org.jgroups.Message;
+import org.jgroups.blocks.RpcDispatcher;
/**
* Processes commands from the server socket.
@@ -56,7 +57,17 @@
JGConnectionHolder holder = JGConnectionHolder.getInstance(ilca);
Channel javagroups = holder.getChannel();
- /* RpcDispatcher disp = */ holder.getDispatcher();
+
+ // don't need a dispatcher unless we are allowing gets.
+ // gets are not supported right now.
+ if ( !ilca.getPutOnlyMode() )
+ {
+ RpcDispatcher disp = holder.getDispatcher();
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "Dispatcher = " + disp );
+ }
+ }
if ( javagroups == null )
{
@@ -89,7 +100,7 @@
{
if ( log.isDebugEnabled() )
{
- log.debug( obj );
+ log.debug( "Received unknown object from jgroups
= " + obj );
}
}
}
@@ -109,7 +120,7 @@
// slow the connection try process down
synchronized (this)
{
- this.wait(10);
+ this.wait(100);
}
// this will cycle unitl connected and eat up the
processor
// need to throw out and recover
1.7 +6 -1
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java
Index: JGConnectionHolder.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JGConnectionHolder.java 16 Nov 2004 07:40:41 -0000 1.6
+++ JGConnectionHolder.java 25 May 2005 15:15:10 -0000 1.7
@@ -127,6 +127,11 @@
public RpcDispatcher getDispatcher()
throws IOException
{
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "Creating Dispatcher, jgroups group name " +
IJGConstants.RPC_JG_GROUP_NAME );
+ }
+
try
{
if ( disp == null )
@@ -142,7 +147,7 @@
}
catch ( Exception e )
{
- log.error( e );
+ log.error( "Problem creating dispatcher", e );
}
return disp;
}
1.8 +1 -1
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java
Index: LateralJGService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LateralJGService.java 12 Jun 2004 02:34:12 -0000 1.7
+++ LateralJGService.java 25 May 2005 15:15:10 -0000 1.8
@@ -71,7 +71,7 @@
catch ( IOException e )
{
- log.error( "Could not create sender to [" +
lca.getJGChannelProperties() + "] -- " + e.getMessage() );
+ log.error( "Could not create sender to [" +
lca.getJGChannelProperties() + "]", e );
throw e;
}
1.9 +2 -2
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java
Index: LateralJGSender.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LateralJGSender.java 23 Jul 2004 12:37:00 -0000 1.8
+++ LateralJGSender.java 25 May 2005 15:15:10 -0000 1.9
@@ -166,7 +166,7 @@
{
ICacheElement ice = null;
- log.debug( "sendAndReceive led" );
+ log.debug( "SendAndReceive led" );
if ( led == null )
{
1.6 +2 -2
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java
Index: JGSocketOpener.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JGSocketOpener.java 12 Jun 2004 02:34:12 -0000 1.5
+++ JGSocketOpener.java 25 May 2005 15:15:10 -0000 1.6
@@ -93,7 +93,7 @@
}
catch ( Exception e )
{
- log.error(e);
+ log.error(" Problem connecting", e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
