[svn] commit: r1257 - in /trunk/src/bin/auth: auth_srv.cc auth_srv.h main.cc

[BIND 10 source code commits]

Author: jinmei
Date: Wed Mar 10 00:58:43 2010
New Revision: 1257

Log:
suppress noisy per-query debug messages unless the -v option is specified
(this is an ad hoc short-term hack.  eventually we should design and implement
more generic logging mechanism)

Modified:
    trunk/src/bin/auth/auth_srv.cc
    trunk/src/bin/auth/auth_srv.h
    trunk/src/bin/auth/main.cc

Modified: trunk/src/bin/auth/auth_srv.cc
==============================================================================
--- trunk/src/bin/auth/auth_srv.cc (original)
+++ trunk/src/bin/auth/auth_srv.cc Wed Mar 10 00:58:43 2010
@@ -89,7 +89,7 @@
 AuthSrv::processMessage(InputBuffer& request_buffer,
                         Message& message,
                         MessageRenderer& response_renderer,
-                        const bool udp_buffer)
+                        const bool udp_buffer, const bool verbose_mode)
 {
     try {
         message.fromWire(request_buffer);
@@ -98,7 +98,9 @@
         return (-1);
     }
 
-    cout << "[AuthSrv] received a message:\n" << message.toText() << endl;
+    if (verbose_mode) {
+        cerr << "[AuthSrv] received a message:\n" << message.toText() << endl;
+    }
 
     if (message.getRRCount(Section::QUESTION()) != 1) {
         return (-1);
@@ -119,9 +121,11 @@
 
     response_renderer.setLengthLimit(udp_buffer ? remote_bufsize : 65535);
     message.toWire(response_renderer);
-    cout << "sending a response (" <<
-        boost::lexical_cast<string>(response_renderer.getLength())
-         << " bytes):\n" << message.toText() << endl;
+    if (verbose_mode) {
+        cerr << "sending a response (" <<
+            boost::lexical_cast<string>(response_renderer.getLength())
+             << " bytes):\n" << message.toText() << endl;
+    }
 
     return (0);
 }

Modified: trunk/src/bin/auth/auth_srv.h
==============================================================================
--- trunk/src/bin/auth/auth_srv.h (original)
+++ trunk/src/bin/auth/auth_srv.h Wed Mar 10 00:58:43 2010
@@ -49,7 +49,7 @@
     int processMessage(isc::dns::InputBuffer& request_buffer,
                        isc::dns::Message& message,
                        isc::dns::MessageRenderer& response_renderer,
-                       bool udp_buffer);
+                       bool udp_buffer, bool verbose_mode);
     void serve(std::string zone_name);
     isc::data::ElementPtr setDbFile(const isc::data::ElementPtr config);
     isc::data::ElementPtr updateConfig(isc::data::ElementPtr config);

Modified: trunk/src/bin/auth/main.cc
==============================================================================
--- trunk/src/bin/auth/main.cc (original)
+++ trunk/src/bin/auth/main.cc Wed Mar 10 00:58:43 2010
@@ -57,6 +57,10 @@
 using namespace isc::cc;
 using namespace isc::config;
 using namespace isc::dns;
+
+namespace {
+static bool verbose_mode = false;
+}
 
 namespace {
 const string PROGRAM = "Auth";
@@ -136,7 +140,8 @@
         if (!error) {
             InputBuffer dnsbuffer(data_, bytes_transferred);
             if (auth_server->processMessage(dnsbuffer, dns_message_,
-                                            response_renderer_, false) == 0) {
+                                            response_renderer_, false,
+                                            verbose_mode) == 0) {
                 responselen_buffer_.writeUint16(response_buffer_.getLength());
                 async_write(socket_,
                             boost::asio::buffer(
@@ -240,7 +245,8 @@
             dns_message_.clear(Message::PARSE);
             response_renderer_.clear();
             if (auth_server->processMessage(request_buffer, dns_message_,
-                                            response_renderer_, true) == 0) {
+                                            response_renderer_, true,
+                                            verbose_mode) == 0) {
                 socket_.async_send_to(
                     boost::asio::buffer(response_buffer_.getData(),
                                         response_buffer_.getLength()),
@@ -451,19 +457,27 @@
     int cc;
     int ts = accept(fd, sa, &sa_len);
 
-    cout << "[XX] process TCP" << endl;
+    if (verbose_mode) {
+        cerr << "[XX] process TCP" << endl;
+    }
     cc = recv(ts, sizebuf, 2, 0);
-    cout << "[XX] got: " << cc << endl;
+    if (verbose_mode) {
+        cerr << "[XX] got: " << cc << endl;
+    }
     uint16_t size, size_n;
     memcpy(&size_n, sizebuf, 2);
     size = ntohs(size_n);
-    cout << "[XX] got: " << size << endl;
+    if (verbose_mode) {
+        cerr << "[XX] got: " << size << endl;
+    }
 
     vector<char> message_buffer;
     message_buffer.reserve(size);
     cc = 0;
     while (cc < size) {
-        cout << "[XX] cc now: " << cc << " of " << size << endl;
+        if (verbose_mode) {
+            cerr << "[XX] cc now: " << cc << " of " << size << endl;
+        }
         cc += recv(ts, &message_buffer[0] + cc, size - cc, 0);
     }
 
@@ -478,10 +492,15 @@
             cc = send(ts, response_renderer.getData(),
                       response_renderer.getLength(), 0);
             if (cc == -1) {
-                cerr << "[AuthSrv] error in sending TCP response message" <<
-                    endl;
+                if (verbose_mode) {
+                    cerr << "[AuthSrv] error in sending TCP response message" <<
+                        endl;
+                }
             } else {
-                cout << "[XX] sent TCP response: " << cc << " bytes" << endl;
+                if (verbose_mode) {
+                    cerr << "[XX] sent TCP response: " << cc << " bytes"
+                         << endl;
+                }
             }
         }
     }
@@ -570,7 +589,7 @@
     bool ipv4_only = false, ipv6_only = false;
     bool use_ipv4 = false, use_ipv6 = false;
 
-    while ((ch = getopt(argc, argv, "46p:")) != -1) {
+    while ((ch = getopt(argc, argv, "46p:v")) != -1) {
         switch (ch) {
         case '4':
             ipv4_only = true;
@@ -581,6 +600,9 @@
         case 'p':
             port = optarg;
             break;
+        case 'v':
+            verbose_mode = true;
+            break;
         case '?':
         default:
             usage();