Changeset 618

Timestamp:

03/25/06 18:09:02 (4 years ago)

Author:

ahu

Message:

remote a lot of silly string processing used for --trace output, even w/o a trace..

Files:

• trunk/pdns/pdns/syncres.cc (modified) (10 diffs)

trunk/pdns/pdns/syncres.cc

@@ -65 +65 @@
 int SyncRes::doResolve(const string &qname, const QType &qtype, vector<DNSResourceRecord>&ret, int depth, set<GetBestNSAnswer>& beenthere)
 {
-  string prefix(d_prefix);
-  prefix.append(depth, ' ');
+  
+  string prefix;
+  if(s_log) {
+    prefix=d_prefix;
+    prefix.append(depth, ' ');
+  }
   
   int res;
@@ -120 +124 @@
 void SyncRes::getBestNSFromCache(const string &qname, set<DNSResourceRecord>&bestns, int depth, set<GetBestNSAnswer>& beenthere)
 {
-  string prefix(d_prefix), subdomain(qname);
-  prefix.append(depth, ' ');
+  string prefix, subdomain(qname);
+  if(s_log) {
+    prefix=d_prefix;
+    prefix.append(depth, ' ');
+  }
   bestns.clear();
 
@@ -188 +195 @@
 bool SyncRes::doCNAMECacheCheck(const string &qname, const QType &qtype, vector<DNSResourceRecord>&ret, int depth, int &res)
 {
-  string prefix(d_prefix), tuple=toLowerCanonic(qname)+"|CNAME";
-  prefix.append(depth, ' ');
+  string prefix;
+  if(s_log) {
+    prefix=d_prefix; 
+    prefix.append(depth, ' ');
+  }
 
   if(depth>10) {
@@ -197 +207 @@
   }
   
-  LOG<<prefix<<qname<<": Looking for CNAME cache hit of '"<<tuple<<"'"<<endl;
+  LOG<<prefix<<qname<<": Looking for CNAME cache hit of '"<<(toLowerCanonic(qname)+"|CNAME")<<"'"<<endl;
   set<DNSResourceRecord> cset;
   if(RC.get(d_now.tv_sec, qname,QType(QType::CNAME),&cset) > 0) {
@@ -203 +213 @@
     for(set<DNSResourceRecord>::const_iterator j=cset.begin();j!=cset.end();++j) {
       if(j->ttl>(unsigned int) d_now.tv_sec) {
-        LOG<<prefix<<qname<<": Found cache CNAME hit for '"<<tuple<<"' to '"<<j->content<<"'"<<endl;    
+        LOG<<prefix<<qname<<": Found cache CNAME hit for '"<< (toLowerCanonic(qname)+"|CNAME") <<"' to '"<<j->content<<"'"<<endl;    
         DNSResourceRecord rr=*j;
         rr.ttl-=d_now.tv_sec;
@@ -217 +227 @@
     }
   }
-  LOG<<prefix<<qname<<": No CNAME cache hit of '"<<tuple<<"' found"<<endl;
+  LOG<<prefix<<qname<<": No CNAME cache hit of '"<< (toLowerCanonic(qname)+"|CNAME") <<"' found"<<endl;
   return false;
 }
@@ -224 +234 @@
 {
   bool giveNegative=false;
-  string prefix(d_prefix), tuple;
-  prefix.append(depth, ' ');
+  
+  string prefix, tuple;
+  if(s_log) {
+    prefix=d_prefix;
+    prefix.append(depth, ' ');
+  }
 
   string sqname(qname);
@@ -339 +353 @@
   }
   random_shuffle(rnameservers.begin(),rnameservers.end());
-  stable_sort(rnameservers.begin(),rnameservers.end(),speedOrder(speeds));
+  stable_sort(rnameservers.begin(),rnameservers.end(), speedOrder(speeds));
   
   if(s_log) {
@@ -360 +374 @@
                 int depth, set<GetBestNSAnswer>&beenthere)
 {
-  string prefix(d_prefix);
-  prefix.append(depth, ' ');
+  string prefix;
+  if(s_log) {
+    prefix=d_prefix;
+    prefix.append(depth, ' ');
+  }
   
   LWRes::res_t result;
@@ -370 +387 @@
     result.clear();
 
-    vector<string> rnameservers=shuffle(nameservers, prefix+qname+": ");
+    vector<string> rnameservers=shuffle(nameservers, s_log ? (prefix+qname+": ") : string() );
 
     for(vector<string>::const_iterator tns=rnameservers.begin();;++tns) {