Add RAWIO log level which is more verbose than DEBUG

[user/henk/code/inspircd.git] / src / configreader.cpp

diff --git a/src/configreader.cpp b/src/configreader.cpp
index c2c66fc316efa0d407520edf029fad821a5e924e..c93e37e1fc35f8a649e873af09cba4c481df5b02 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -21,7 +21,7 @@
 ServerConfig::ServerConfig()
 {
        WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
-       NoUserDns = OperSpyWhois = HideBans = HideSplits = UndernetMsgPrefix = false;
+       RawLog = NoUserDns = OperSpyWhois = HideBans = HideSplits = UndernetMsgPrefix = false;
        WildcardIPv6 = CycleHosts = InvBypassModes = true;
        dns_timeout = 5;
        MaxTargets = 20;
@@ -148,8 +148,11 @@ static void FindDNS(std::string& server)
                if (server == "nameserver")
                {
                        resolv >> server;
-                       ServerInstance->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",server.c_str());
-                       return;
+                       if (server.find_first_not_of("0123456789.") == std::string::npos)
+                       {
+                               ServerInstance->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",server.c_str());
+                               return;
+                       }
                }
        }
 
@@ -856,9 +859,7 @@ void ConfigReaderThread::Finish()
 {
        ServerConfig* old = ServerInstance->Config;
        ServerInstance->Logs->Log("CONFIG",DEBUG,"Switching to new configuration...");
-       ServerInstance->Logs->CloseLogs();
        ServerInstance->Config = this->Config;
-       ServerInstance->Logs->OpenFileLogs();
        Config->Apply(old, TheUserUID);
 
        if (Config->valid)
@@ -879,13 +880,17 @@ void ConfigReaderThread::Finish()
                FOREACH_MOD(I_OnRehash, OnRehash(user));
                ServerInstance->BuildISupport();
 
+               ServerInstance->Logs->CloseLogs();
+               ServerInstance->Logs->OpenFileLogs();
+
+               if (Config->RawLog)
+                       ServerInstance->Users->ServerNoticeAll("*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
+
                Config = old;
        }
        else
        {
                // whoops, abort!
-               ServerInstance->Logs->CloseLogs();
                ServerInstance->Config = old;
-               ServerInstance->Logs->OpenFileLogs();
        }
 }