fix meritsrecursion issue + reduce cache cleaning

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1222 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/packetcache.cc b/pdns/packetcache.cc
index c18dea293114c41506521caef6723e607f083ee8..e0bb1c7851c5a75d00ebe6fc4e71084db117e179 100644 (file)
--- a/pdns/packetcache.cc
+++ b/pdns/packetcache.cc
@@ -45,7 +45,7 @@ PacketCache::PacketCache()
 int PacketCache::get(DNSPacket *p, DNSPacket *cached)
 {
   extern StatBag S;
-  if(!((d_hit+d_miss)%5000)) {
+  if(!((d_hit+d_miss)%15000)) {
     cleanup();
   }
 
@@ -121,7 +121,7 @@ void PacketCache::insert(DNSPacket *q, DNSPacket *r)
 
   bool packetMeritsRecursion=d_doRecursion && q->d.rd;
 
-  insert(q->qdomain, q->qtype, PacketCache::PACKETCACHE, r->getString(), packetMeritsRecursion ? d_recursivettl : d_ttl);  // XXX FIXME forgets meritsRecursion
+  insert(q->qdomain, q->qtype, PacketCache::PACKETCACHE, r->getString(), packetMeritsRecursion ? d_recursivettl : d_ttl, packetMeritsRecursion);
 }
 
 // universal key appears to be: qname, qtype, kind (packet, query cache), optionally zoneid, meritsRecursion
@@ -130,7 +130,7 @@ void PacketCache::insert(const string &qname, const QType& qtype, CacheEntryType
   if(!ttl)
     return;
   
-  //  cerr<<"Inserting qname '"<<qname<<"', cet: "<<(int)cet<<", value: '"<< (cet ? value : "PACKET") <<"', qtype: "<<qtype.getName()<<endl;
+  //  cerr<<"Inserting qname '"<<qname<<"', cet: "<<(int)cet<<", value: '"<< (cet ? value : "PACKET") <<"', qtype: "<<qtype.getName()<<", ttl: "<<ttl<<endl;
 
   CacheEntry val;
   val.ttd=time(0)+ttl;
@@ -225,7 +225,7 @@ int PacketCache::purge(const vector<string> &matches)
          //    cerr<<"Stopping!"<<endl;
          break;
        }
-       //      cerr<<"Will erase '"<<iter->qname<<"'\n";
+       //      cerr<<"Will erase '"<<iter->qname<<"'\n";
 
        delcount++;
       }