Chain ValidateServerName onto ValidateHostname so that the servername gets hostname...

[user/henk/code/inspircd.git] / src / modules / m_chanlog.cpp

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index a5fcbe5bf2b8ab7b207868c50f962ec87ff9280d..5070f190a7cac59b4b70fc31e57f05891ba07c6c 100644 (file)
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -26,18 +26,23 @@ class ChannelLogStream : public LogStream
        virtual void OnLog(int loglevel, const std::string &type, const std::string &msg)
        {
                Channel *c = ServerInstance->FindChan(channel);
+               static bool Logging = false;
 
-printf("I got called\n");
                if (loglevel < this->loglvl)
                        return;
 
+               if (Logging)
+                       return;
+
                if (c)
                {
+                       Logging = true; // this avoids (rare chance) loops with logging server IO on networks
                        char buf[MAXBUF];
                        snprintf(buf, MAXBUF, "\2%s\2: %s", type.c_str(), msg.c_str());
 
                        c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name, buf);
                        ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
+                       Logging = false;
                }
        }
 };
@@ -111,9 +116,6 @@ class ModuleChanLog : public Module
                        }
 
                        std::string target = Conf.ReadValue("log", "target", index);
-
-printf("looking at tag with method: %s type: %s level: %s target: %s", method.c_str(), type.c_str(), level.c_str(), target.c_str());
-
                        ChannelLogStream* c = new ChannelLogStream(ServerInstance, loglevel, target);
                        ServerInstance->Logs->AddLogTypes(type, c, true);
                        cls.push_back(c);