logging fixes

webserver timeout fixes

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

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index d96c7046ef970bc08f2ad9e473f852c87491846a..e53afdc01b4f8fb26c68ce391e8a1d9db4c4a6b0 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -154,7 +154,7 @@ int PacketHandler::doDNSCheckRequest(DNSPacket *p, DNSPacket *r, string &target)
   DNSResourceRecord rr;
 
   if (p->qclass == 3 && p->qtype.getName() == "HINFO") {
-    rr.content = "PowerDNS $Id: packethandler.cc,v 1.11 2003/03/12 16:06:35 ahu Exp $";
+    rr.content = "PowerDNS $Id: packethandler.cc,v 1.12 2003/03/17 13:44:53 ahu Exp $";
     rr.ttl = 5;
     rr.qname=target;
     rr.qtype=13; // hinfo
@@ -170,7 +170,7 @@ int PacketHandler::doVersionRequest(DNSPacket *p, DNSPacket *r, string &target)
 {
   DNSResourceRecord rr;
   if(p->qtype.getCode()==QType::TXT && target=="version.bind") {// TXT
-    rr.content="Served by POWERDNS "VERSION" $Id: packethandler.cc,v 1.11 2003/03/12 16:06:35 ahu Exp $";
+    rr.content="Served by POWERDNS "VERSION" $Id: packethandler.cc,v 1.12 2003/03/17 13:44:53 ahu Exp $";
     rr.ttl=5;
     rr.qname=target;
     rr.qtype=QType::TXT; // TXT
@@ -455,7 +455,7 @@ int PacketHandler::trySuperMaster(DNSPacket *p)
   }
   db->createSlaveDomain(p->getRemote(),p->qdomain,account);
   Communicator.addSuckRequest(p->qdomain, p->getRemote());  
-  L<<"Created new slave zone '"<<p->qdomain<<"' from supermaster "<<p->getRemote()<<", queued axfr"<<endl;
+  L<<Logger::Warning<<"Created new slave zone '"<<p->qdomain<<"' from supermaster "<<p->getRemote()<<", queued axfr"<<endl;
   return RCode::NoError;
 }
 

diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 262b635fefda38cc44386147e67fb5cffaad8dba..b5ecc2e319ef9defed83e9dcdfecece52530504c 100644 (file)
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -185,6 +185,7 @@ void *WebServer::serveConnection(void *p)
   Session *client=static_cast<Session *>(p);
   try {
     string line;
+    client->setTimeout(5);
     client->getLine(line);
     stripLine(line);
     //    L<<"page: "<<line<<endl;