Changeset 2085

Timestamp:

03/22/11 20:42:12 (2 years ago)

Author:

ahu

Message:

fix up various small things, plus remove ugly debugging prints from AXFR handler, replaced with nice log message

Location:

trunk/pdns/pdns

Files:

• logger.cc (modified) (1 diff)
• logger.hh (modified) (1 diff)
• lwres.cc (modified) (1 diff)
• tcpreceiver.cc (modified) (1 diff)
• webserver.cc (modified) (1 diff)

trunk/pdns/pdns/logger.cc

@@ -126 +126 @@
 }
 
+Logger& Logger::operator<<(double i)
+{
+  ostringstream tmp;
+  tmp<<i;
+  *this<<tmp.str();
+  return *this;
+}
+
 Logger& Logger::operator<<(unsigned int i)
 {

trunk/pdns/pdns/logger.hh

@@ -111 +111 @@
   Logger& operator<<(const string &s);   //!< log a string
   Logger& operator<<(int);   //!< log an int
+  Logger& operator<<(double);   //!< log a double
   Logger& operator<<(unsigned int);   //!< log an unsigned int
   Logger& operator<<(long);   //!< log an unsigned int

trunk/pdns/pdns/lwres.cc

@@ -165 +165 @@
   lwr->d_result.clear();
   try {
+    lwr->d_tcbit=0;
     MOADNSParser mdp((const char*)buf.get(), len);
     lwr->d_aabit=mdp.d_header.aa;

trunk/pdns/pdns/tcpreceiver.cc

@@ -710 +710 @@
   
   udiff=dt.udiffNoReset();
-  cerr<<"Done: "<<csp.d_signed/(udiff/1000000.0)<<" sigs/s, "<<csp.d_signed<<" / "<<udiff/1000000.0<<endl;
-  cerr<<"Outstanding: "<<csp.d_outstanding<<", "<<csp.d_queued - csp.d_signed << endl;
-  cerr<<"Ready for consumption: "<<csp.getReady()<<endl;
+  if(securedZone) 
+    L<<Logger::Info<<"Done signing: "<<csp.d_signed/(udiff/1000000.0)<<" sigs/s, "<<endl;
   
   DLOG(L<<"Done writing out records"<<endl);

trunk/pdns/pdns/webserver.cc

@@ -138 +138 @@
 
     HandlerFunction *fptr;
-    if((fptr=d_functions[baseUrl])) {
+    if(d_functions.count(baseUrl) && (fptr=d_functions[baseUrl])) {
       bool custom=false;
       string ret=(*fptr)(varmap, d_that, &custom);