foo

6 files changed, 24 insertions, 24 deletions

diff --git a/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp b/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp
index 7f5c1d9ab6c..96d1177dc7e 100644
--- a/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp
+++ b/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp
@@ -339,14 +339,10 @@ Supplier_Proxy::recv (ACE_Message_Block *&forward_addr)
         }
 
       this->total_bytes (data_received + header_received);
-#if defined (VERBOSE)
-      ACE_DEBUG ((LM_DEBUG, "(%t) connection id = %d, supplier id = %d, len = %d, payload = %*s",
-		 event_addr.proxy_id_, event->header_.supplier_id_, event->header_.len_,
-		 event->header_.len_, event->data_));
-#else
       ACE_DEBUG ((LM_DEBUG, "(%t) supplier id = %d, cur len = %d, total bytes read = %d\n",
-		 event->header_.supplier_id_, event->header_.len_, data_received + header_received));
-#endif /* VERBOSE */
+		  event->header_.supplier_id_, event->header_.len_, data_received + header_received));
+      if (this->event_channel_.options ().verbose_)
+	ACE_DEBUG ((LM_DEBUG, "data_ = %*s\n", event->header_.len_ - 2, event->data_));
 
       // Encode before returning so that we can set things out in
       // network byte order.
diff --git a/apps/Gateway/Gateway/Event_Channel.cpp b/apps/Gateway/Gateway/Event_Channel.cpp
index 5c2f3ee93ca..c23e57d728b 100644
--- a/apps/Gateway/Gateway/Event_Channel.cpp
+++ b/apps/Gateway/Gateway/Event_Channel.cpp
@@ -13,7 +13,8 @@ ACE_Event_Channel_Options::ACE_Event_Channel_Options (void)
     threading_strategy_ (REACTIVE),
     acceptor_port_ (ACE_DEFAULT_GATEWAY_SERVER_PORT),
     connector_role_ (0),
-    acceptor_role_ (0)
+    acceptor_role_ (0),
+    verbose_ (0)
 {
 }
 
diff --git a/apps/Gateway/Gateway/Event_Channel.h b/apps/Gateway/Gateway/Event_Channel.h
index 22dd8137147..9ef23732328 100644
--- a/apps/Gateway/Gateway/Event_Channel.h
+++ b/apps/Gateway/Gateway/Event_Channel.h
@@ -75,6 +75,9 @@ public:
 
   int acceptor_role_;
   // Enabled if we are playing the role of the Connector.
+
+  int verbose_;
+  // Enabled if we want verbose diagnostic output.
 };
 
 class ACE_Svc_Export ACE_Event_Channel : public ACE_Task<ACE_SYNCH>
diff --git a/apps/Gateway/Gateway/Gateway.cpp b/apps/Gateway/Gateway/Gateway.cpp
index f9d505a5733..867865ff0e8 100644
--- a/apps/Gateway/Gateway/Gateway.cpp
+++ b/apps/Gateway/Gateway/Gateway.cpp
@@ -98,7 +98,7 @@ Gateway::parse_args (int argc, char *argv[])
   ACE_OS::strcpy (this->consumer_config_file_, "consumer_config");
   this->debug_ = 0;
 
-  ACE_Get_Opt get_opt (argc, argv, "abC:cdP:pq:t:w:", 0);
+  ACE_Get_Opt get_opt (argc, argv, "abC:cdP:pq:t:vw:", 0);
 
   for (int c; (c = get_opt ()) != EOF; )
     {
@@ -151,6 +151,9 @@ Gateway::parse_args (int argc, char *argv[])
 
 	    break;
 	  }
+	case 'v': // Verbose mode.
+	  this->event_channel_.options ().verbose_ = 1;
+	  break;
 	case 'w': // Time performance for a designated amount of time.
 	  this->event_channel_.options ().performance_window_ = 
 	    ACE_OS::atoi (get_opt.optarg);
diff --git a/apps/Gateway/Gateway/proxy_config b/apps/Gateway/Gateway/proxy_config
index e0784e4038e..df034f543b1 100644
--- a/apps/Gateway/Gateway/proxy_config
+++ b/apps/Gateway/Gateway/proxy_config
@@ -35,7 +35,7 @@
 # ID		     Port    Role   Timeout    Port   
 # ----  --------     ------  ------ ---------- -----  --------
    1    merengue.cs  10010   S	    32	       0      1
-   2    tango.cs     10010   C	    32	       0      1
+   2    mambo.cs     10010   C	    32	       0      1
 #  3    mambo.cs     10002   C	    32	       0      1
 #  4    lambada.cs   10002   C	    32	       0      1
 #  5    lambada.cs   10002   C	    32	       0      1
diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp
index a2d98aaf35b..9d7db934427 100644
--- a/apps/Gateway/Peer/Peer.cpp
+++ b/apps/Gateway/Peer/Peer.cpp
@@ -28,6 +28,8 @@
 #include "ace/INET_Addr.h"
 #include "Event.h"
 
+static int verbose = 0;
+
 // Handle Peer events arriving as events. 
 
 class Peer_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
@@ -459,14 +461,10 @@ Peer_Handler::recv (ACE_Message_Block *&mb)
           this->msg_frag_ = 0; 
         }
 
-#if defined (VERBOSE)
-      ACE_DEBUG ((LM_DEBUG, "(%t) connection id = %d, supplier id = %d, len = %d, payload = %*s",
-		 event_addr.conn_id_, event->header_.supplier_id_, event->header_.len_,
-		 event->header_.len_, event->data_));
-#else
       ACE_DEBUG ((LM_DEBUG, "(%t) supplier id = %d, cur len = %d, total bytes read = %d\n",
 		 event->header_.supplier_id_, event->header_.len_, data_received + header_received));
-#endif /* VERBOSE */
+      if (verbose)
+	ACE_DEBUG ((LM_DEBUG, "data_ = %*s\n", event->header_.len_ - 2, event->data_));
       return data_received + header_received;
     }
 }
@@ -552,18 +550,14 @@ Peer_Handler::await_events (void)
 	Event *event = (Event *) mb->rd_ptr ();
 	this->total_bytes_ += mb->length ();
 
-#if defined (VERBOSE)
-	ACE_DEBUG ((LM_DEBUG, 
-		    "route id = %d, len = %d, payload = %*s",
-		   event->header_.supplier_id_, event->header_.len_,
-		   event->header_.len_, event->data_));
-#else
 	ACE_DEBUG ((LM_DEBUG, 
 		    "route id = %d, cur len = %d, total len = %d\n",
 		    event->header_.supplier_id_, 
 		    event->header_.len_, 
 		    this->total_bytes_));
-#endif /* VERBOSE */
+      if (verbose)
+	ACE_DEBUG ((LM_DEBUG, "data_ = %s\n", event->data_));
+
 	mb->release ();
 	return 0;
       }
@@ -722,7 +716,7 @@ Peer_Acceptor::fini (void)
 void
 Peer_Acceptor::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "dp:", 0);
+  ACE_Get_Opt get_opt (argc, argv, "dp:v", 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -733,6 +727,9 @@ Peer_Acceptor::parse_args (int argc, char *argv[])
 	  break;
 	case 'd':
 	  break;
+	case 'v': // Verbose mode.
+	  verbose = 1;
+	  break;
 	default:
 	  break;
 	}