Author: aconway Date: Wed Oct 28 17:38:58 2009 New Revision: 830696 URL: http://svn.apache.org/viewvc?rev=830696&view=rev Log: Reduce redundancy in cluster log output.
start_cluster: Use PID in cluster name to avoid name clashes with multiple tests. Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp qpid/trunk/qpid/cpp/src/tests/start_cluster Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp?rev=830696&r1=830695&r2=830696&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Wed Oct 28 17:38:58 2009 @@ -349,7 +349,6 @@ // This thread decodes frames from events. void Cluster::deliveredEvent(const Event& e) { if (e.isCluster()) { - QPID_LOG(trace, *this << " DLVR: " << e); EventFrame ef(e, e.getFrame()); // Stop the deliverEventQueue on update offers. // This preserves the connection decoder fragments for an update. @@ -361,8 +360,7 @@ } deliverFrame(ef); } - else if(!discarding) { - QPID_LOG(trace, *this << " DLVR: " << e); + else if(!discarding) { if (e.isControl()) deliverFrame(EventFrame(e, e.getFrame())); else { @@ -376,8 +374,6 @@ } } } - else // Discard connection events if discarding is set. - QPID_LOG(trace, *this << " DROP: " << e); } void Cluster::flagError( Modified: qpid/trunk/qpid/cpp/src/tests/start_cluster URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/start_cluster?rev=830696&r1=830695&r2=830696&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/tests/start_cluster (original) +++ qpid/trunk/qpid/cpp/src/tests/start_cluster Wed Oct 28 17:38:58 2009 @@ -28,7 +28,7 @@ rm -f cluster*.log cluster.ports qpidd.port SIZE=${1:-3}; shift -CLUSTER=`pwd` # Cluster name=pwd, avoid clashes. +CLUSTER=$HOSTNAME.$$ OPTS="-d --no-module-dir --load-module ../.libs/cluster.so --cluster-name=$CLUSTER --auth=no --log-enable notice+ --log-enable debug+:cluster $@" for (( i=0; i<SIZE; ++i )); do --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org