Thread: [Ubermq-commits] jms/src/com/ubermq/jms/server/proc DatagramProc.java,1.40,1.41 EchoMessageProcessor
Brought to you by:
jimmyp
From: <ji...@us...> - 2004-01-21 02:05:30
|
Update of /cvsroot/ubermq/jms/src/com/ubermq/jms/server/proc In directory sc8-pr-cvs1:/tmp/cvs-serv28341/src/com/ubermq/jms/server/proc Modified Files: DatagramProc.java EchoMessageProcessor.java Removed Files: TTLOverflowHandler.java Log Message: bug fixes related to read/write initialization race conditions Index: DatagramProc.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/server/proc/DatagramProc.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** DatagramProc.java 12 Jan 2004 19:24:25 -0000 1.40 --- DatagramProc.java 21 Jan 2004 02:05:27 -0000 1.41 *************** *** 1,18 **** package com.ubermq.jms.server.proc; import com.ubermq.jms.client.impl.*; import com.ubermq.jms.server.*; import com.ubermq.jms.server.admin.*; - import com.ubermq.jms.server.datagram.*; - import com.ubermq.jms.server.datagram.control.*; import com.ubermq.jms.server.journal.*; import com.ubermq.jms.server.journal.impl.*; - import com.ubermq.jms.server.routing.*; - import com.ubermq.jms.server.routing.impl.*; import com.ubermq.kernel.*; - import java.io.*; - import java.lang.reflect.*; - import java.nio.*; - import java.util.*; /** --- 1,19 ---- package com.ubermq.jms.server.proc; + import java.io.*; + import java.lang.reflect.*; + import java.util.*; + import com.ubermq.jms.client.impl.*; + import com.ubermq.jms.common.datagram.*; + import com.ubermq.jms.common.datagram.control.*; + import com.ubermq.jms.common.overflow.*; + import com.ubermq.jms.common.routing.*; + import com.ubermq.jms.common.routing.impl.*; import com.ubermq.jms.server.*; import com.ubermq.jms.server.admin.*; import com.ubermq.jms.server.journal.*; import com.ubermq.jms.server.journal.impl.*; import com.ubermq.kernel.*; /** *************** *** 24,27 **** --- 25,30 ---- implements IMessageProcessor, MessageServerAdmin, IRouterStatistics { + private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(DatagramProc.class); + // the standard overflow handler for outgoing messages private static final long INITIAL_TIMEOUT = Long.valueOf(Configurator.getProperty(ServerConfig.DGP_INITIAL_TIMEOUT, "50")).longValue(); *************** *** 188,192 **** private void ack(IConnectionInfo conn, IAckDatagram ad) { ! com.ubermq.Utility.getLogger().debug("ack! " + ad.toString()); // route this using the ACK router. --- 191,195 ---- private void ack(IConnectionInfo conn, IAckDatagram ad) { ! com.ubermq.util.Utility.getLogger().debug("ack! " + ad.toString()); // route this using the ACK router. *************** *** 201,205 **** private void control(IConnectionInfo conn, IControlDatagram cd) { ! com.ubermq.Utility.getLogger().debug("control! " + cd.toString()); boolean ack = false; --- 204,208 ---- private void control(IConnectionInfo conn, IControlDatagram cd) { ! com.ubermq.util.Utility.getLogger().debug("control! " + cd.toString()); boolean ack = false; *************** *** 322,330 **** catch(Exception x) { ! com.ubermq.Utility.getLogger().error("", x); ack = false; } finally { // send the ACK of the command back to the caller // so the caller can proceed --- 325,335 ---- catch(Exception x) { ! log.error("Failed sending acknowledgement", x); ack = false; } finally { + log.debug("Sending acknowledgement " + ack + " to " + conn + " for RPC"); + // send the ACK of the command back to the caller // so the caller can proceed *************** *** 333,337 **** // show the router status ! com.ubermq.Utility.getLogger().debug(router.toString()); } --- 338,342 ---- // show the router status ! com.ubermq.util.Utility.getLogger().debug(router.toString()); } *************** *** 396,403 **** --- 401,411 ---- // output the ACK or NACK, as appropriate. + log.debug("sending " + conn + " message ID " + md.getMessageId() + " ack=" + !ad.isNegativeAck()); conn.output(ad, overflow); } catch (IOException e) { + log.debug("could not send message acknowledgement", e); + // connection failed. remove(conn); *************** *** 414,417 **** --- 422,427 ---- catch (IOException e) { + log.debug("could not send RPC ack due to I/O problem", e); + // looks like the caller went down. // blow him away. *************** *** 453,457 **** // this is a severe error if we cannot open the durable logfile // we should report it to the user. ! com.ubermq.Utility.getLogger().fatal(e.getMessage()); return null; } --- 463,467 ---- // this is a severe error if we cannot open the durable logfile // we should report it to the user. ! com.ubermq.util.Utility.getLogger().fatal(e.getMessage()); return null; } *************** *** 516,520 **** private void restoreDurableSubscriber(DurableSubscriptionProxy p) { ! com.ubermq.Utility.getLogger().info("restoring durable subscriber " + p.getName()); // subscribe the proxy to the topics. --- 526,530 ---- private void restoreDurableSubscriber(DurableSubscriptionProxy p) { ! com.ubermq.util.Utility.getLogger().info("restoring durable subscriber " + p.getName()); // subscribe the proxy to the topics. Index: EchoMessageProcessor.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/server/proc/EchoMessageProcessor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EchoMessageProcessor.java 12 Jan 2004 19:24:25 -0000 1.6 --- EchoMessageProcessor.java 21 Jan 2004 02:05:27 -0000 1.7 *************** *** 21,25 **** public void accept(IConnectionInfo ci) { ! com.ubermq.Utility.getLogger().info("accepted " + ci); allConnections.add(ci); } --- 21,25 ---- public void accept(IConnectionInfo ci) { ! com.ubermq.util.Utility.getLogger().info("accepted " + ci); allConnections.add(ci); } *************** *** 40,44 **** if (!conn.equals(sender)) { ! com.ubermq.Utility.getLogger().info("outputting " + d + " to " + conn); try { --- 40,44 ---- if (!conn.equals(sender)) { ! com.ubermq.util.Utility.getLogger().info("outputting " + d + " to " + conn); try { *************** *** 47,51 **** catch (java.io.IOException e) { ! com.ubermq.Utility.getLogger().error("", e); } } --- 47,51 ---- catch (java.io.IOException e) { ! com.ubermq.util.Utility.getLogger().error("", e); } } --- TTLOverflowHandler.java DELETED --- |