From 404287243e51f3687af3c389dae8193a200e4684 Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 17 Jul 2014 20:43:53 +0200
Subject: [PATCH] Cleanup backend reporting when module is loaded

Log everything at the same severity,
in the same way.
---
 modules/bindbackend/bindbackend2.cc        | 2 +-
 modules/db2backend/DB2Backend.cc           | 2 +-
 modules/geobackend/geobackend.hh           | 4 +---
 modules/gmysqlbackend/gmysqlbackend.cc     | 2 +-
 modules/goraclebackend/goraclebackend.cc   | 2 +-
 modules/gpgsqlbackend/gpgsqlbackend.cc     | 2 +-
 modules/gsqlite3backend/gsqlite3backend.cc | 2 +-
 modules/ldapbackend/ldapbackend.cc         | 2 +-
 modules/lmdbbackend/lmdbbackend.cc         | 3 +--
 modules/luabackend/luabackend.cc           | 2 +-
 modules/mydnsbackend/mydnsbackend.cc       | 2 +-
 modules/opendbxbackend/odbxbackend.hh      | 2 +-
 modules/pipebackend/pipebackend.cc         | 3 +--
 modules/randombackend/randombackend.cc     | 4 ++--
 modules/remotebackend/remotebackend.cc     | 2 +-
 modules/tinydnsbackend/tinydnsbackend.cc   | 2 +-
 pdns/docs/pdns.xml                         | 3 +--
 17 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 20556208f5..0e934e136f 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -1341,7 +1341,7 @@ public:
   Bind2Loader()
   {
     BackendMakers().report(new Bind2Factory);
-    L<<Logger::Notice<<"[Bind2Backend] This is the bind backend version "VERSION" ("__DATE__", "__TIME__") reporting"<<endl;
+    L << Logger::Info << "[bind2backend] This is the bind backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
   }
 };
 static Bind2Loader bind2loader;
diff --git a/modules/db2backend/DB2Backend.cc b/modules/db2backend/DB2Backend.cc
index 8c3a9986ae..19cb3a5b96 100644
--- a/modules/db2backend/DB2Backend.cc
+++ b/modules/db2backend/DB2Backend.cc
@@ -616,7 +616,7 @@ class DB2Loader
       Loader()
       {
          BackendMakers().report(new DB2Factory);
-         L << Logger::Notice << kBackendName << " This is the DB2 module version "VERSION" ("__DATE__", "__TIME__") reporting" << endl;
+         L << Logger::Info << "[db2backend] This is the db2 backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
       }
 };
 
diff --git a/modules/geobackend/geobackend.hh b/modules/geobackend/geobackend.hh
index 5509982cbe..2be48f52b3 100644
--- a/modules/geobackend/geobackend.hh
+++ b/modules/geobackend/geobackend.hh
@@ -105,9 +105,7 @@ class GeoLoader {
 public:
         GeoLoader() {
         	BackendMakers().report(new GeoFactory);
-        	
-        	L << Logger::Info << "[GeoBackend] This is the geobackend ("
-        		__DATE__", "__TIME__" - $Revision: 1.1 $) reporting" << endl;
+		L << Logger::Info << "[geobackend] This is the geo backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
         }
 };
 
diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc
index 50abc56908..c73cedae44 100644
--- a/modules/gmysqlbackend/gmysqlbackend.cc
+++ b/modules/gmysqlbackend/gmysqlbackend.cc
@@ -142,7 +142,7 @@ public:
   gMySQLLoader()
   {
     BackendMakers().report(new gMySQLFactory("gmysql"));
-    L<<Logger::Warning<<"This is module gmysqlbackend.so reporting"<<endl;
+    L << Logger::Info << "[gmysqlbackend] This is the gmysql backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
   }
 };
 static gMySQLLoader gmysqlloader;
diff --git a/modules/goraclebackend/goraclebackend.cc b/modules/goraclebackend/goraclebackend.cc
index 741dbe7a2f..d6ae9b017b 100644
--- a/modules/goraclebackend/goraclebackend.cc
+++ b/modules/goraclebackend/goraclebackend.cc
@@ -148,7 +148,7 @@ public:
   //! This reports us to the main UeberBackend class
   gOracleLoader() {
     BackendMakers().report(new gOracleFactory("goracle"));
-    L<<Logger::Warning<<"This is module goraclebackend reporting"<<endl;
+    L << Logger::Info << "[goraclebackend] This is the goracle backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
   }
 };
 
diff --git a/modules/gpgsqlbackend/gpgsqlbackend.cc b/modules/gpgsqlbackend/gpgsqlbackend.cc
index 2a78b906d8..d127cb4634 100644
--- a/modules/gpgsqlbackend/gpgsqlbackend.cc
+++ b/modules/gpgsqlbackend/gpgsqlbackend.cc
@@ -137,7 +137,7 @@ public:
   {
     BackendMakers().report(new gPgSQLFactory("gpgsql"));
     BackendMakers().report(new gPgSQLFactory("gpgsql2"));
-    L<<Logger::Warning<<"This is module gpgsqlbackend.so reporting"<<endl;
+    L << Logger::Info << "[gpgsqlbackend] This is the gpgsql backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
   }
 };
 static gPgSQLLoader gpgsqlloader;
diff --git a/modules/gsqlite3backend/gsqlite3backend.cc b/modules/gsqlite3backend/gsqlite3backend.cc
index deb9b52b4a..c5b257766c 100644
--- a/modules/gsqlite3backend/gsqlite3backend.cc
+++ b/modules/gsqlite3backend/gsqlite3backend.cc
@@ -154,7 +154,7 @@ public:
   gSQLite3Loader()
   {
     BackendMakers().report( new gSQLite3Factory( "gsqlite3" ));
-    L<<Logger::Warning << "This is module gsqlite3 reporting" << std::endl;
+    L << Logger::Info << "[gsqlite3] This is the gsqlite3 backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << std::endl;
   }
 };
 
diff --git a/modules/ldapbackend/ldapbackend.cc b/modules/ldapbackend/ldapbackend.cc
index 1649627999..57d9899dae 100644
--- a/modules/ldapbackend/ldapbackend.cc
+++ b/modules/ldapbackend/ldapbackend.cc
@@ -564,7 +564,7 @@ public:
         LdapLoader()
         {
         	BackendMakers().report( &factory );
-        	L << Logger::Info << " [LdapBackend] This is the ldap module version "VERSION" ("__DATE__", "__TIME__") reporting" << endl;
+		L << Logger::Info << "[ldapbackend] This is the ldap backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
         }
 };
 
diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index 9820493a35..080d747dcc 100644
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -537,8 +537,7 @@ public:
   LMDBLoader()
   {
     BackendMakers().report(new LMDBFactory);
-
-    L<<Logger::Info<<" [LMDBBackend] This is the LMDBBackend version ("__DATE__", "__TIME__") reporting"<<endl;
+    L << Logger::Info << "[lmdbbackend] This is the lmdb backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
   }
 };
 
diff --git a/modules/luabackend/luabackend.cc b/modules/luabackend/luabackend.cc
index 3e4bf3ddc4..9391e6253d 100644
--- a/modules/luabackend/luabackend.cc
+++ b/modules/luabackend/luabackend.cc
@@ -49,7 +49,7 @@ public:
   {
     BackendMakers().report(new LUAFactory);
     
-    L<<Logger::Notice<<"[LUABackend] This is the luabackend ("__DATE__", "__TIME__") reporting"<<endl;
+    L << Logger::Info << "[luabackend] This is the lua backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
   }  
 };
 
diff --git a/modules/mydnsbackend/mydnsbackend.cc b/modules/mydnsbackend/mydnsbackend.cc
index f3a04f480c..579ac97d6e 100644
--- a/modules/mydnsbackend/mydnsbackend.cc
+++ b/modules/mydnsbackend/mydnsbackend.cc
@@ -369,7 +369,7 @@ class MyDNSLoader {
 public:
         MyDNSLoader() {
         	BackendMakers().report(new MyDNSFactory());
-        	L<<Logger::Info<<backendName<<" This is the MyDNSBackend ("__DATE__", "__TIME__") reporting"<<endl;
+		L << Logger::Info << "[mydnsbackend] This is the mydns backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
         }
 };
 
diff --git a/modules/opendbxbackend/odbxbackend.hh b/modules/opendbxbackend/odbxbackend.hh
index 54d016d766..56e4d0a8ec 100644
--- a/modules/opendbxbackend/odbxbackend.hh
+++ b/modules/opendbxbackend/odbxbackend.hh
@@ -164,7 +164,7 @@ public:
         OdbxLoader()
         {
         	BackendMakers().report( &factory );
-        	L.log( " [OpendbxBackend] This is the opendbx module version "VERSION" ("__DATE__", "__TIME__") reporting", Logger::Info );
+		L.log( "[opendbxbackend] This is the opendbx backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting", Logger::Info );
         }
 };
 
diff --git a/modules/pipebackend/pipebackend.cc b/modules/pipebackend/pipebackend.cc
index 8fcc8a864a..9f256d1c56 100644
--- a/modules/pipebackend/pipebackend.cc
+++ b/modules/pipebackend/pipebackend.cc
@@ -290,8 +290,7 @@ class PipeLoader
       PipeLoader()
       {
          BackendMakers().report(new PipeFactory);
-         
-         L<<Logger::Notice<<kBackendId<<" This is the pipebackend version "VERSION" ("__DATE__", "__TIME__") reporting"<<endl;
+         L << Logger::Info << kBackendId <<" This is the pipe backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
       }  
 };
 
diff --git a/modules/randombackend/randombackend.cc b/modules/randombackend/randombackend.cc
index 3dc25ff7a2..1244410a22 100644
--- a/modules/randombackend/randombackend.cc
+++ b/modules/randombackend/randombackend.cc
@@ -26,6 +26,7 @@
 #include "pdns/dnspacket.hh"
 #include "pdns/pdnsexception.hh"
 #include "pdns/logger.hh"
+#include "pdns/version.hh"
 #include <boost/algorithm/string.hpp>
 
 /* FIRST PART */
@@ -99,8 +100,7 @@ public:
   RandomLoader()
   {
     BackendMakers().report(new RandomFactory);
-    
-    L<<Logger::Info<<" [RandomBackend] This is the randombackend version "VERSION" ("__DATE__", "__TIME__") reporting"<<endl;
+    L << Logger::Info << "[randombackend] This is the random backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
   }  
 };
 
diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
index 508bf775b4..75a61d8d5e 100644
--- a/modules/remotebackend/remotebackend.cc
+++ b/modules/remotebackend/remotebackend.cc
@@ -1069,7 +1069,7 @@ public:
 
 RemoteLoader::RemoteLoader() {
     BackendMakers().report(new RemoteBackendFactory);
-    L<<Logger::Notice<<kBackendId<<" This is the remotebackend version "VERSION" ("__DATE__", "__TIME__") reporting"<<endl;
+    L << Logger::Info << kBackendId << " This is the remote backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
 }
 
 static RemoteLoader remoteloader;
diff --git a/modules/tinydnsbackend/tinydnsbackend.cc b/modules/tinydnsbackend/tinydnsbackend.cc
index 8d7274f8a1..a30177f529 100644
--- a/modules/tinydnsbackend/tinydnsbackend.cc
+++ b/modules/tinydnsbackend/tinydnsbackend.cc
@@ -334,7 +334,7 @@ class TinyDNSLoader
 public:
 	TinyDNSLoader() {
 		BackendMakers().report(new TinyDNSFactory);
-		L<<Logger::Info<<" [TinyDNSBackend] This is the TinyDNSBackend ("__DATE__", "__TIME__") reporting"<<endl;
+		L << Logger::Info << " [tinydnsbackend] This is the tinydns backend version " VERSION " (" __DATE__ ", " __TIME__ ") reporting" << endl;
 	}
 };
 
diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml
index df975a5a04..4b4cd60601 100644
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -23062,8 +23062,7 @@ public:
   RandomLoader()
   {
     BackendMakers().report(new RandomFactory);
-    
-    L&lt;&lt;Logger::Info&lt;&lt;" [RandomBackend] This is the randombackend ("__DATE__", "__TIME__") reporting"&lt;&lt;endl;
+    L &lt;&lt; Logger::Info &lt;&lt; "[randombackend] This is the random backend version " VERSION " reporting" &lt;&lt; endl;
   }  
 };
 
-- 
2.47.2