From c057bfaa35ee5f60526711e5f96dbf1d5c7a1c7c Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 14 Feb 2015 15:18:37 +0100
Subject: [PATCH] Cleanup the log messages a bit

And fix a few typos while we're at it.
---
 modules/ldapbackend/ldapbackend.cc     |  2 +-
 modules/pipebackend/pipebackend.cc     |  8 ++++----
 modules/remotebackend/remotebackend.cc |  8 ++++----
 pdns/dnsbackend.cc                     |  4 ++--
 pdns/dynlistener.cc                    |  2 +-
 pdns/mastercommunicator.cc             |  2 +-
 pdns/misc.cc                           |  2 +-
 pdns/nameserver.cc                     | 12 ++++++------
 pdns/packethandler.cc                  |  2 +-
 pdns/pdns_recursor.cc                  |  4 ++--
 pdns/rec_channel_rec.cc                |  4 ++--
 pdns/receiver.cc                       |  7 +++----
 pdns/reczones.cc                       |  2 +-
 pdns/signingpipe.cc                    |  2 +-
 pdns/tcpreceiver.cc                    |  4 ++--
 15 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/modules/ldapbackend/ldapbackend.cc b/modules/ldapbackend/ldapbackend.cc
index 137804f6b7..0eda8630b5 100644
--- a/modules/ldapbackend/ldapbackend.cc
+++ b/modules/ldapbackend/ldapbackend.cc
@@ -312,7 +312,7 @@ inline bool LdapBackend::prepare()
         	m_ttl = (uint32_t) strtol( m_result["dNSTTL"][0].c_str(), &endptr, 10 );
         	if( *endptr != '\0' )
         	{
-        		L << Logger::Warning << m_myname << " Invalid time to life for " << m_qname << ": " << m_result["dNSTTL"][0] << endl;
+        		L << Logger::Warning << m_myname << " Invalid time to live for " << m_qname << ": " << m_result["dNSTTL"][0] << endl;
         		m_ttl = m_default_ttl;
         	}
         	m_result.erase( "dNSTTL" );
diff --git a/modules/pipebackend/pipebackend.cc b/modules/pipebackend/pipebackend.cc
index 3fb7dc9b1b..b8f68d764f 100644
--- a/modules/pipebackend/pipebackend.cc
+++ b/modules/pipebackend/pipebackend.cc
@@ -80,7 +80,7 @@ void CoWrapper::receive(string &line)
       return;
    }
    catch(PDNSException &ae) {
-      L<<Logger::Warning<<kBackendId<<" unable to receive data from coprocess. "<<ae.reason<<endl;
+      L<<Logger::Warning<<kBackendId<<" Unable to receive data from coprocess. "<<ae.reason<<endl;
       delete d_cp;
       d_cp=0;
       throw;
@@ -205,7 +205,7 @@ bool PipeBackend::get(DNSResourceRecord &r)
       vector<string>parts;
       stringtok(parts,line,"\t");
       if(parts.empty()) {
-         L<<Logger::Error<<kBackendId<<" coprocess returned emtpy line in query for "<<d_qname<<endl;
+         L<<Logger::Error<<kBackendId<<" Coprocess returned empty line in query for "<<d_qname<<endl;
          throw PDNSException("Format error communicating with coprocess");
       }
       else if(parts[0]=="FAIL") {
@@ -220,7 +220,7 @@ bool PipeBackend::get(DNSResourceRecord &r)
       }
       else if(parts[0]=="DATA") { // yay
          if(parts.size() < 7 + extraFields) {
-            L<<Logger::Error<<kBackendId<<" coprocess returned incomplete or empty line in data section for query for "<<d_qname<<endl;
+            L<<Logger::Error<<kBackendId<<" Coprocess returned incomplete or empty line in data section for query for "<<d_qname<<endl;
             throw PDNSException("Format error communicating with coprocess in data section");
             // now what?
          }
@@ -247,7 +247,7 @@ bool PipeBackend::get(DNSResourceRecord &r)
          }
          else {
            if(parts.size()< 8 + extraFields) {
-            L<<Logger::Error<<kBackendId<<" coprocess returned incomplete MX/SRV line in data section for query for "<<d_qname<<endl;
+            L<<Logger::Error<<kBackendId<<" Coprocess returned incomplete MX/SRV line in data section for query for "<<d_qname<<endl;
             throw PDNSException("Format error communicating with coprocess in data section of MX/SRV record");
            }
            
diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
index feaffe9ca8..47dbad905a 100644
--- a/modules/remotebackend/remotebackend.cc
+++ b/modules/remotebackend/remotebackend.cc
@@ -33,9 +33,9 @@ bool Connector::recv(rapidjson::Document &value) {
            if (messages.IsArray()) {
               // log em all
               for (rapidjson::Value::ValueIterator iter = messages.Begin(); iter != messages.End(); ++iter)
-                 L<<Logger::Info<<"[remotebackend]:"<< getString(*iter) <<std::endl;
+                 L<<Logger::Info<<"[remotebackend]: "<< getString(*iter) <<std::endl;
            } else if (messages.IsNull() == false) { // could be just a value
-               L<<Logger::Info<<"[remotebackend]:"<< getString(messages) <<std::endl;
+               L<<Logger::Info<<"[remotebackend]: "<< getString(messages) <<std::endl;
            }
         }
         return rv;
@@ -613,7 +613,7 @@ bool RemoteBackend::getDomainInfo(const string &domain, DomainInfo &di) {
 
    // make sure we got zone & kind
    if (!answer["result"].IsObject() || !answer["result"].HasMember("zone")) {
-      L<<Logger::Error<<kBackendId<<"Missing zone in getDomainInfo return value"<<endl;
+      L<<Logger::Error<<kBackendId<<" Missing zone in getDomainInfo return value"<<endl;
       throw PDNSException();
    }
    value = -1;
@@ -656,7 +656,7 @@ void RemoteBackend::setNotified(uint32_t id, uint32_t serial) {
    query.AddMember("parameters", parameters, query.GetAllocator());
  
    if (this->send(query) == false || this->recv(answer) == false) {
-      L<<Logger::Error<<kBackendId<<"Failed to execute RPC for RemoteBackend::setNotified("<<id<<","<<serial<<")"<<endl;
+      L<<Logger::Error<<kBackendId<<" Failed to execute RPC for RemoteBackend::setNotified("<<id<<","<<serial<<")"<<endl;
    }
 }
 
diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
index 90c6d1d49d..a861c99ea2 100644
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@ -136,7 +136,7 @@ void BackendMakerClass::load(const string &module)
     res=UeberBackend::loadmodule(arg()["module-dir"]+"/"+module);
   
   if(res==false) {
-    L<<Logger::Error<<"dnsbackend unable to load module in "<<module<<endl;
+    L<<Logger::Error<<"DNSBackend unable to load module in "<<module<<endl;
     exit(1);
   }
 }
@@ -258,7 +258,7 @@ bool DNSBackend::getSOA(const string &domain, SOAData &sd, DNSPacket *p)
   }
 
   if(!sd.serial) { // magic time!
-    DLOG(L<<Logger::Warning<<"Doing soa serialnumber autocalculation for "<<rr.qname<<endl);
+    DLOG(L<<Logger::Warning<<"Doing SOA serial number autocalculation for "<<rr.qname<<endl);
 
     time_t serial;
     if (calculateSOASerial(domain, sd, serial)) {
diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc
index 8e6dc142e7..5b3c8c1261 100644
--- a/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@ -172,7 +172,7 @@ DynListener::DynListener(const string &progname)
     if(!mkdir(socketname.c_str(),0700)) // make /var directory, if needed
       L<<Logger::Warning<<"Created local state directory '"<<socketname<<"'"<<endl;
     else if(errno!=EEXIST) {
-      L<<Logger::Critical<<"FATAL: Unable to create socket directory ("<<socketname<<") and it does not exist yet"<<endl;
+      L<<Logger::Critical<<"Unable to create socket directory ("<<socketname<<") and it does not exist yet"<<endl;
       exit(1);
     }
     
diff --git a/pdns/mastercommunicator.cc b/pdns/mastercommunicator.cc
index 55d77929e4..cb3a6770b9 100644
--- a/pdns/mastercommunicator.cc
+++ b/pdns/mastercommunicator.cc
@@ -60,7 +60,7 @@ void CommunicatorClass::queueNotifyDomain(const string &domain, UeberBackend *B)
         const ComboAddress caIp(*k, 53);
         if(!d_preventSelfNotification || !AddressIsUs(caIp)) {
           if(!d_onlyNotify.match(&caIp))
-            L<<Logger::Info<<"Skiped notification of domain '"<<domain<<"' to "<<*j<<" because it does not match only-notify."<<endl;
+            L<<Logger::Info<<"Skipped notification of domain '"<<domain<<"' to "<<*j<<" because it does not match only-notify."<<endl;
           else
             ips.insert(caIp.toStringWithPort());
         }
diff --git a/pdns/misc.cc b/pdns/misc.cc
index 01529cf054..e155bc9bc1 100644
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -916,7 +916,7 @@ void setSocketTimestamps(int fd)
 #ifdef SO_TIMESTAMP
   int on=1;
   if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMP, (char*)&on, sizeof(on)) < 0 )
-    L<<Logger::Error<<"Warning: unable to enable timestamp reporting for socket"<<endl;
+    L<<Logger::Error<<"Unable to enable timestamp reporting for socket"<<endl;
 #endif
 }
 
diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 27823af82e..a46aa83e65 100644
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -100,7 +100,7 @@ void UDPNameserver::bindIPv4()
     s=socket(AF_INET,SOCK_DGRAM,0);
 
     if(s<0) {
-      L<<Logger::Error<<"Unable to acquire a UDP socket: "+string(strerror(errno)) << endl;
+      L<<Logger::Error<<"Unable to acquire UDP socket: "+string(strerror(errno)) << endl;
       throw PDNSException("Unable to acquire a UDP socket: "+string(strerror(errno)));
     }
   
@@ -137,7 +137,7 @@ void UDPNameserver::bindIPv4()
         L<<Logger::Error<<"IPv4 Address " << localname << " does not exist on this server - skipping UDP bind" << endl;
         continue;
       } else {
-        L<<Logger::Error<<"binding UDP socket to '"+locala.toStringWithPort()+"': "<<binderror<<endl;
+        L<<Logger::Error<<"Unable to bind UDP socket to '"+locala.toStringWithPort()+"': "<<binderror<<endl;
         throw PDNSException("Unable to bind to UDP socket");
       }
     }
@@ -199,8 +199,8 @@ void UDPNameserver::bindIPv6()
 
     s=socket(AF_INET6,SOCK_DGRAM,0);
     if(s<0) {
-      L<<Logger::Error<<"Unable to acquire a UDPv6 socket: "+string(strerror(errno)) << endl;
-      throw PDNSException("Unable to acquire a UDPv6 socket: "+string(strerror(errno)));
+      L<<Logger::Error<<"Unable to acquire UDPv6 socket: "+string(strerror(errno)) << endl;
+      throw PDNSException("Unable to acquire UDPv6 socket: "+string(strerror(errno)));
     }
 
     Utility::setCloseOnExec(s);
@@ -231,8 +231,8 @@ void UDPNameserver::bindIPv6()
         L<<Logger::Error<<"IPv6 Address " << localname << " does not exist on this server - skipping UDP bind" << endl;
         continue;
       } else {
-        L<<Logger::Error<<"binding to UDP ipv6 socket "<< localname <<": "<<strerror(errno)<<endl;
-        throw PDNSException("Unable to bind to UDP ipv6 socket");
+        L<<Logger::Error<<"Unable to bind to UDPv6 socket "<< localname <<": "<<strerror(errno)<<endl;
+        throw PDNSException("Unable to bind to UDPv6 socket");
       }
     }
     d_sockets.push_back(s);
diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index de7ecabd72..651beb1384 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1160,7 +1160,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
         addRootReferral(r);
       }
       else {
-        DLOG(L<<Logger::Warning<<"setting 'No Error'"<<endl);
+        DLOG(L<<Logger::Warning<<"Setting 'No Error'"<<endl);
       }
       goto sendit;
     }
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 72f46837c2..1c9272af48 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -264,7 +264,7 @@ void setSocketBuffer(int fd, int optname, uint32_t size)
   }
 
   if (setsockopt(fd, SOL_SOCKET, optname, (char*)&size, sizeof(size)) < 0 )
-    L<<Logger::Error<<"Warning: unable to raise socket buffer size to "<<size<<": "<<strerror(errno)<<endl;
+    L<<Logger::Error<<"Unable to raise socket buffer size to "<<size<<": "<<strerror(errno)<<endl;
 }
 
 
@@ -469,7 +469,7 @@ static void writePid(void)
   if(of)
     of<< Utility::getpid() <<endl;
   else
-    L<<Logger::Error<<"Requested to write pid for "<<Utility::getpid()<<" to "<<s_pidfname<<" failed: "<<strerror(errno)<<endl;
+    L<<Logger::Error<<"Writing pid for "<<Utility::getpid()<<" to "<<s_pidfname<<" failed: "<<strerror(errno)<<endl;
 }
 
 typedef map<ComboAddress, uint32_t, ComboAddress::addressOnlyLessThan> tcpClientCounts_t;
diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index aefce242de..4c0dc19a71 100644
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -883,12 +883,12 @@ string RecursorControlParser::getAnswer(const string& question, RecursorControlP
     } 
     catch(std::exception& e) 
     {
-      L<<Logger::Error<<"reloading ACLs failed (Exception: "<<e.what()<<")"<<endl;
+      L<<Logger::Error<<"Reloading ACLs failed (Exception: "<<e.what()<<")"<<endl;
       return e.what() + string("\n");
     }
     catch(PDNSException& ae)
     {
-      L<<Logger::Error<<"reloading ACLs failed (PDNSException: "<<ae.reason<<")"<<endl;
+      L<<Logger::Error<<"Reloading ACLs failed (PDNSException: "<<ae.reason<<")"<<endl;
       return ae.reason + string("\n");
     }
     return "ok\n";
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 9452edf184..3925f95e80 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -130,7 +130,7 @@ static void writePid(void)
   if(of)
     of<<getpid()<<endl;
   else
-    L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<" failed: "<<strerror(errno)<<endl;
+    L<<Logger::Error<<"Writing pid for "<<getpid()<<" to "<<fname<<" failed: "<<strerror(errno)<<endl;
 }
 
 int g_fd1[2], g_fd2[2];
@@ -308,8 +308,7 @@ static int guardian(int argc, char **argv)
           exit(1);
         }
         setStatus("Child died with code "+itoa(ret));
-        L<<Logger::Error<<"Our pdns instance exited with code "<<ret<<endl;
-        L<<Logger::Error<<"Respawning"<<endl;
+        L<<Logger::Error<<"Our pdns instance exited with code "<<ret<<", respawning"<<endl;
 
         sleep(1);
         continue;
@@ -366,7 +365,7 @@ static void loadModules()
         res=UeberBackend::loadmodule(::arg()["module-dir"]+"/"+module);
       
       if(res==false) {
-        L<<Logger::Error<<"receiver unable to load module "<<module<<endl;
+        L<<Logger::Error<<"Receiver unable to load module "<<module<<endl;
         exit(1);
       }
     }
diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index 6f79004a6c..acf09ce910 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -297,7 +297,7 @@ string reloadAuthAndForwards()
     return "ok\n";
   }
   catch(std::exception& e) {
-    L<<Logger::Error<<"Had error reloading zones, keeping original data: "<<e.what()<<endl;
+    L<<Logger::Error<<"Encountered error reloading zones, keeping original data: "<<e.what()<<endl;
   }
   catch(PDNSException& ae) {
     L<<Logger::Error<<"Encountered error reloading zones, keeping original data: "<<ae.reason<<endl;
diff --git a/pdns/signingpipe.cc b/pdns/signingpipe.cc
index c2bd2d381c..3b21b97b9b 100644
--- a/pdns/signingpipe.cc
+++ b/pdns/signingpipe.cc
@@ -63,7 +63,7 @@ try
   return 0;
 }
 catch(...) {
-  L<<Logger::Error<<"unknown exception in signing thread occurred"<<endl;
+  L<<Logger::Error<<"Unknown exception in signing thread occurred"<<endl;
   return 0;
 }
 
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index dbbd83e5fd..8417bde7dd 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -1088,7 +1088,7 @@ TCPNameserver::TCPNameserver()
         L<<Logger::Error<<"IPv4 Address " << *laddr << " does not exist on this server - skipping TCP bind" << endl;
         continue;
       } else {
-        L<<Logger::Error<<"binding to TCP socket " << *laddr << ": "<<strerror(errno)<<endl;
+        L<<Logger::Error<<"Unable to bind to TCP socket " << *laddr << ": "<<strerror(errno)<<endl;
         throw PDNSException("Unable to bind to TCP socket");
       }
     }
@@ -1128,7 +1128,7 @@ TCPNameserver::TCPNameserver()
         L<<Logger::Error<<"IPv6 Address " << *laddr << " does not exist on this server - skipping TCP bind" << endl;
         continue;
       } else {
-        L<<Logger::Error<<"binding to TCPv6 socket" << *laddr << ": "<<strerror(errno)<<endl;
+        L<<Logger::Error<<"Unable to bind to TCPv6 socket" << *laddr << ": "<<strerror(errno)<<endl;
         throw PDNSException("Unable to bind to TCPv6 socket");
       }
     }
-- 
2.47.2