From 77a0927ded844a58fead8ab39a60644c8211c5d2 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 28 Oct 2009 17:38:58 +0000
Subject: Reduce redundancy in cluster log output.

start_cluster: Use PID in cluster name to avoid name clashes with multiple tests.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@830696 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/cluster/Cluster.cpp | 6 +-----
 cpp/src/tests/start_cluster      | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'cpp')

diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index 0706fc72e8..f5db692e92 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -349,7 +349,6 @@ const ClusterUpdateOfferBody* castUpdateOffer(const framing::AMQBody* body) {
 // 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 @@ void Cluster::deliveredEvent(const Event& e) {
         }
         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 @@ void Cluster::deliveredEvent(const Event& e) {
             }
         }
     }
-    else // Discard connection events if discarding is set.
-        QPID_LOG(trace, *this << " DROP: " << e);
 }
 
 void Cluster::flagError(
diff --git a/cpp/src/tests/start_cluster b/cpp/src/tests/start_cluster
index fb3d27373a..dadb1ee743 100755
--- a/cpp/src/tests/start_cluster
+++ b/cpp/src/tests/start_cluster
@@ -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
-- 
cgit v1.2.1