cluster: fix delivery-property.exchange-name set on updated messages.

Logging improvements, useful for debugging:
 - qpid/SessionState.cpp: show frame bodies with command IDs.
 - assign cluster-wide id number to each Event.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@750456 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 17 insertions, 17 deletions

diff --git a/qpid/cpp/src/tests/cluster_test.cpp b/qpid/cpp/src/tests/cluster_test.cpp
index 6702686c2a..1acb2d4bf4 100644
--- a/qpid/cpp/src/tests/cluster_test.cpp
+++ b/qpid/cpp/src/tests/cluster_test.cpp
@@ -509,10 +509,11 @@ QPID_AUTO_TEST_CASE(testCatchupSharedState) {
     c0.session.queueDeclare("q");
     c0.session.messageTransfer(arg::content=Message("foo","q"));
     c0.session.messageTransfer(arg::content=Message("bar","q"));
+
     while (c0.session.queueQuery("q").getMessageCount() != 2)
         sys::usleep(1000);    // Wait for message to show up on broker 0.
 
-    // Add a new broker, it should catch up.
+    // Add a new broker, it will catch up.
     cluster.add();
 
     // Do some work post-add
@@ -530,6 +531,7 @@ QPID_AUTO_TEST_CASE(testCatchupSharedState) {
 
     BOOST_CHECK(c1.subs.get(m, "q", TIMEOUT));
     BOOST_CHECK_EQUAL(m.getData(), "foo");
+    BOOST_CHECK_EQUAL(m.getDeliveryProperties().getExchange(), "");
     BOOST_CHECK(c1.subs.get(m, "q", TIMEOUT));
     BOOST_CHECK_EQUAL(m.getData(), "bar");
     BOOST_CHECK_EQUAL(c1.session.queueQuery("q").getMessageCount(), 0u);
diff --git a/qpid/cpp/src/tests/failover_soak.cpp b/qpid/cpp/src/tests/failover_soak.cpp
index 65c93c8e27..d84b6d58f7 100644
--- a/qpid/cpp/src/tests/failover_soak.cpp
+++ b/qpid/cpp/src/tests/failover_soak.cpp
@@ -339,7 +339,6 @@ wait_for_newbie ( )
   {
     Connection connection;
     connection.open ( "127.0.0.1", newbie_port );
-    sleep ( 2 );
     connection.close();
     newbie = 0;  // He's no newbie anymore!
     return true;
@@ -368,20 +367,19 @@ startNewBroker ( brokerVector & brokers,
     module << moduleDir << "/cluster.so";
     path << srcRoot << "/qpidd";
     prefix << "soak-" << brokerId;
-
-    std::vector<std::string> argv = 
-        list_of<string> ("qpidd")
-                        ("--no-module-dir")
-                        ("--load-module=cluster.so")
-                        ("--cluster-name")
-                        (clusterName)
-                        ("--auth=no")
-                        ("--no-data-dir")
-                        ("--mgmt-enable=no")
-                        ("--log-prefix")
-                        (prefix.str())
-                        ("--log-to-file")
-                        ("/tmp/qpidd.log");
+    std::vector<std::string> argv = list_of<string>
+        ("qpidd")
+        ("--no-module-dir")
+        ("--load-module=cluster.so")
+        ("--cluster-name")
+        (clusterName)
+        ("--auth=no")
+        ("--no-data-dir")
+        ("--mgmt-enable=no")
+        ("--log-prefix")
+        (prefix.str())
+        ("--log-to-file")
+        (prefix.str()+".log");
 
     newbie = new ForkedBroker ( argv );
     newbie_port = newbie->getPort();
diff --git a/qpid/cpp/src/tests/replaying_sender.cpp b/qpid/cpp/src/tests/replaying_sender.cpp
index f66056e357..ea2a13bd54 100644
--- a/qpid/cpp/src/tests/replaying_sender.cpp
+++ b/qpid/cpp/src/tests/replaying_sender.cpp
@@ -72,7 +72,7 @@ void Sender::execute(AsyncSession& session, bool isRetry)
         sender.send(message);
         if (count > reportFrequency && !(sent % reportFrequency)) {
             if ( verbosity > 0 )
-                std::cout << "sent " << sent << " of " << count << std::endl;
+                std::cout << "Sender sent " << sent << " of " << count << std::endl;
         }
     }
     message.setData("That's all, folks!");