From b34510a3cda746fbd88f9a47693b7ce552420f77 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <christian.hofstaedtler@deduktiva.com>
Date: Sun, 3 Jan 2016 01:08:16 +0100
Subject: [PATCH] Remove Logger::NTLog

An unused relict.
---
 modules/luabackend/lua_functions.cc | 3 ---
 pdns/logger.hh                      | 4 ++--
 pdns/lua-pdns.cc                    | 2 --
 pdns/mastercommunicator.cc          | 2 +-
 pdns/tcpreceiver.cc                 | 5 ++---
 pdns/ueberbackend.cc                | 4 ++--
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/modules/luabackend/lua_functions.cc b/modules/luabackend/lua_functions.cc
index 816bcac6dc..67aabfe9b7 100644
--- a/modules/luabackend/lua_functions.cc
+++ b/modules/luabackend/lua_functions.cc
@@ -161,9 +161,6 @@ void register_lua_functions(lua_State *lua) {
     lua_pushinteger(lua, Logger::All);
     lua_setglobal(lua, "log_all");
 
-    lua_pushinteger(lua, Logger::NTLog);
-    lua_setglobal(lua, "log_ntlog");
-
     lua_pushinteger(lua, Logger::Alert);
     lua_setglobal(lua, "log_alert");
 
diff --git a/pdns/logger.hh b/pdns/logger.hh
index 70e8f983d1..d4079f885a 100644
--- a/pdns/logger.hh
+++ b/pdns/logger.hh
@@ -39,8 +39,8 @@ public:
   Logger(const string &, int facility=LOG_DAEMON); //!< pass the identification you wish to appear in the log
 
   //! The urgency of a log message
-  enum Urgency {All=32767,NTLog=12345,Alert=LOG_ALERT, Critical=LOG_CRIT, Error=LOG_ERR, Warning=LOG_WARNING,
-        	Notice=LOG_NOTICE,Info=LOG_INFO, Debug=LOG_DEBUG, None=-1};
+  enum Urgency {All=32767,Alert=LOG_ALERT, Critical=LOG_CRIT, Error=LOG_ERR, Warning=LOG_WARNING,
+                Notice=LOG_NOTICE,Info=LOG_INFO, Debug=LOG_DEBUG, None=-1};
 
   /** Log a message.
       \param msg Message you wish to log
diff --git a/pdns/lua-pdns.cc b/pdns/lua-pdns.cc
index 22eaaacf2f..a3c4604fe5 100644
--- a/pdns/lua-pdns.cc
+++ b/pdns/lua-pdns.cc
@@ -172,8 +172,6 @@ void pushSyslogSecurityLevelTable(lua_State* lua)
 // this function takes the global lua_state from the PowerDNSLua constructor and populates it with the syslog enums values
   lua_pushnumber(lua, Logger::All);
   lua_setfield(lua, -2, "All");
-  lua_pushnumber(lua, Logger::NTLog);
-  lua_setfield(lua, -2, "NTLog");
   lua_pushnumber(lua, Logger::Alert);
   lua_setfield(lua, -2, "Alert");
   lua_pushnumber(lua, Logger::Critical);
diff --git a/pdns/mastercommunicator.cc b/pdns/mastercommunicator.cc
index 7fa27ebc55..1897986858 100644
--- a/pdns/mastercommunicator.cc
+++ b/pdns/mastercommunicator.cc
@@ -210,7 +210,7 @@ time_t CommunicatorClass::doNotifications()
       }
     }
     else
-      L<<Logger::Error<<Logger::NTLog<<"Notification for "<<domain<<" to "<<ip<<" failed after retries"<<endl;
+      L<<Logger::Error<<"Notification for "<<domain<<" to "<<ip<<" failed after retries"<<endl;
   }
 
   return d_nq.earliest();
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 9824a04102..9920f51603 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -76,7 +76,6 @@ void TCPNameserver::go()
     s_P=new PacketHandler;
   }
   catch(PDNSException &ae) {
-    L<<Logger::Error<<Logger::NTLog<<"TCP server is unable to launch backends - will try again when questions come in"<<endl;
     L<<Logger::Error<<"TCP server is unable to launch backends - will try again when questions come in: "<<ae.reason<<endl;
   }
   pthread_create(&d_tid, 0, launcher, static_cast<void *>(this));
@@ -1243,7 +1242,7 @@ void TCPNameserver::thread()
             L<<Logger::Error<<"TCP question accept error: "<<strerror(errno)<<endl;
             
             if(errno==EMFILE) {
-              L<<Logger::Error<<Logger::NTLog<<"TCP handler out of filedescriptors, exiting, won't recover from this"<<endl;
+              L<<Logger::Error<<"TCP handler out of filedescriptors, exiting, won't recover from this"<<endl;
               exit(1);
             }
           }
@@ -1254,7 +1253,7 @@ void TCPNameserver::thread()
             int room;
             d_connectionroom_sem->getValue( &room);
             if(room<1)
-              L<<Logger::Warning<<Logger::NTLog<<"Limit of simultaneous TCP connections reached - raise max-tcp-connections"<<endl;
+              L<<Logger::Warning<<"Limit of simultaneous TCP connections reached - raise max-tcp-connections"<<endl;
 
             if(pthread_create(&tid, 0, &doConnection, reinterpret_cast<void*>(fd))) {
               L<<Logger::Error<<"Error creating thread: "<<stringerror()<<endl;
diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index 4358e79381..359d0b0246 100644
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -534,8 +534,8 @@ void UeberBackend::lookup(const QType &qtype,const DNSName &qname, DNSPacket *pk
   d_ancount=0;
 
   if(!backends.size()) {
-    L<<Logger::Error<<Logger::NTLog<<"No database backends available - unable to answer questions."<<endl;
-    stale=true; // please recycle us! 
+    L<<Logger::Error<<"No database backends available - unable to answer questions."<<endl;
+    stale=true; // please recycle us!
     throw PDNSException("We are stale, please recycle");
   }
   else {
-- 
2.47.2