2 files changed, 6 insertions, 5 deletions
diff --git a/qpid/cpp/examples/failover/direct_producer.cpp b/qpid/cpp/examples/failover/direct_producer.cpp
index ef2231a7f0..1bee56e164 100644
--- a/qpid/cpp/examples/failover/direct_producer.cpp
+++ b/qpid/cpp/examples/failover/direct_producer.cpp
@@ -40,14 +40,13 @@ main ( int argc, char ** argv)
     int port = argc>2 ? atoi(argv[2]) : 5672;
     int count  = argc>3 ? atoi(argv[3]) : 30;
     int delayMs  = argc>4 ? atoi(argv[4]) : 1000;
+    string program_name = "PRODUCER";
 
     try {
         FailoverConnection connection;
         FailoverSession    * session;
         Message message;
 
-        string program_name = "PRODUCER";
-
         connection.open ( host, port );
         session = connection.newSession();
         int sent  = 0;
@@ -89,9 +88,10 @@ main ( int argc, char ** argv)
 
         session->sync();
         connection.close();
+        std::cout << program_name << ": " << " completed without error." << std::endl;
         return 0;  
     } catch(const std::exception& error) {
-        std::cout << error.what() << std::endl;
+        std::cout << program_name << ": " << error.what() << std::endl;
     }
     return 1;
 }
diff --git a/qpid/cpp/examples/failover/listener.cpp b/qpid/cpp/examples/failover/listener.cpp
index c4c7d096b3..1c47127389 100644
--- a/qpid/cpp/examples/failover/listener.cpp
+++ b/qpid/cpp/examples/failover/listener.cpp
@@ -229,9 +229,9 @@ main ( int argc, char ** argv )
 {
     const char* host = argc>1 ? argv[1] : "127.0.0.1";
     int port = argc>2 ? atoi(argv[2]) : 5672;
+    string program_name = "LISTENER";
 
     try {
-        string program_name = "LISTENER";
 
         FailoverConnection connection;
         FailoverSession    * session;
@@ -250,10 +250,11 @@ main ( int argc, char ** argv )
         subscriptions.run ( );
 
         connection.close();
+        std::cout << program_name << ": " << " completed without error." << std::endl;
         return 0;
 
     } catch(const std::exception& error) {
-        std::cout << error.what() << std::endl;
+        std::cout << program_name  << ": " << error.what() << std::endl;
     }
     return 1;
 }