Fix a bug in new logging API (global logstreams weren't notified of events if a speci...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8865 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/filelogger.h b/include/filelogger.h
index d236fe3de4fd95a1886215c1634c9457f3079428..333a0236e18736e4197335107f6404c7e00f8ab1 100644 (file)
--- a/include/filelogger.h
+++ b/include/filelogger.h
@@ -93,7 +93,7 @@ class CoreExport FileLogStream : public LogStream
  private:
        FileLogger *f;
  public:
-       FileLogStream(InspIRCd *Instance, FILE *f, const std::string &type) : LogStream(Instance, type)
+       FileLogStream(InspIRCd *Instance, FILE *f) : LogStream(Instance)
        {
                this->f = new FileLogger(Instance, f);
        }
@@ -103,7 +103,7 @@ class CoreExport FileLogStream : public LogStream
                delete this->f;
        }
 
-       virtual void OnLog(int loglevel, const std::string &msg);
+       virtual void OnLog(int loglevel, const std::string &type, const std::string &msg);
 };
 
 #endif

diff --git a/include/logger.h b/include/logger.h
index 70407422f4f3b55ad30b68fb1d23468bd14e144c..492f6c20ac1c534bcd7f8c195a75270d03fa3642 100644 (file)
--- a/include/logger.h
+++ b/include/logger.h
@@ -18,20 +18,19 @@ class CoreExport LogStream : public classbase
 {
  protected:
        InspIRCd *ServerInstance;
-       std::string type;
  public:
-       LogStream(InspIRCd *Instance, const std::string &type)
+       LogStream(InspIRCd *Instance)
        {
                this->ServerInstance = Instance;
-               this->type = type;
        }
 
-       virtual void OnLog(int loglevel, const std::string &msg) { }
+       virtual void OnLog(int loglevel, const std::string &type, const std::string &msg) { }
 };
 
 class CoreExport LogManager : public classbase
 {
  private:
+       bool Logging; // true when logging, avoids recursion
        InspIRCd *ServerInstance;
        std::map<std::string, std::vector<LogStream *> > LogStreams;
        std::vector<LogStream *> GlobalLogStreams; //holds all logstreams with a type of *
@@ -39,6 +38,7 @@ class CoreExport LogManager : public classbase
        LogManager(InspIRCd *Instance)
        {
                ServerInstance = Instance;
+               Logging = false;
        }
 
        void CloseLogs();

diff --git a/src/filelogger.cpp b/src/filelogger.cpp
index 0e50f628e9877743cc639e81e8e8cc2e0bc5d89b..d63d58915bacfe41a9f41f954d583aa459926695 100644 (file)
--- a/src/filelogger.cpp
+++ b/src/filelogger.cpp
@@ -102,7 +102,7 @@ FileLogger::~FileLogger()
 }
 
 
-void FileLogStream::OnLog(int loglevel, const std::string &text)
+void FileLogStream::OnLog(int loglevel, const std::string &type, const std::string &text)
 {
        static char TIMESTR[26];
        static time_t LAST = 0;

diff --git a/src/logger.cpp b/src/logger.cpp
index 53cc7941f43be5198ea4970e6607926e2b6f9d36..03c02fe09f9659a052e83260076229c19edf26f0 100644 (file)
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -127,8 +127,11 @@ bool LogManager::DelLogType(const std::string &type, LogStream *l)
 
 void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ...)
 {
+       if (Logging)
+               return;
+
        va_list a;
-       char buf[65536];
+       static char buf[65536];
 
        va_start(a, fmt);
        vsnprintf(buf, 65536, fmt, a);
@@ -139,6 +142,19 @@ void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ...
 
 void LogManager::Log(const std::string &type, int loglevel, const std::string &msg)
 {
+       if (Logging)
+               return;
+
+       Logging = true;
+
+       std::vector<LogStream *>::iterator gi = GlobalLogStreams.begin();
+
+       while (gi != GlobalLogStreams.end())
+       {
+               (*gi)->OnLog(loglevel, type, msg);
+               gi++;
+       }
+
        std::map<std::string, std::vector<LogStream *> >::iterator i = LogStreams.find(type);
 
        if (i != LogStreams.end())
@@ -147,23 +163,12 @@ void LogManager::Log(const std::string &type, int loglevel, const std::string &m
 
                while (it != i->second.end())
                {
-                       (*it)->OnLog(loglevel, msg);
+                       (*it)->OnLog(loglevel, type, msg);
                        it++;
                }
-
-               return;
-       }
-
-       std::vector<LogStream *>::iterator gi = GlobalLogStreams.begin();
-
-       while (gi != GlobalLogStreams.end())
-       {
-               (*gi)->OnLog(loglevel, msg);
-               gi++;
        }
 
-       // blurp, no handler for this type
-       return;
+       Logging = false;
 }
 
 

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
new file mode 100644 (file)
index 0000000..a0d3da4
--- /dev/null
+++ b/src/modules/m_chanlog.cpp
@@ -0,0 +1,65 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+
+class ChannelLogStream : public LogStream
+{
+ private:
+       std::string channel;
+       
+ public:
+       ChannelLogStream(InspIRCd *Instance, const std::string &chan) : LogStream(Instance), channel(chan)
+       {
+       }
+                                                               
+       virtual void OnLog(int loglevel, const std::string &type, const std::string &msg)
+       {
+               Channel *c = ServerInstance->FindChan(channel);
+               
+               if (c)
+               {
+                       // So this won't work remotely. Oh well.
+                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :\2%s\2: %s", c->name, type.c_str(), msg.c_str());
+               }
+       }
+};
+
+/* $ModDesc: Logs output to a channel instead of / as well as a file. */
+
+class ModuleChanLog : public Module
+{
+ private:
+       InspIRCd *ServerInstance;
+       ChannelLogStream *l;
+ public:
+       ModuleChanLog(InspIRCd* Me) : Module(Me)
+       {
+               l = new ChannelLogStream(Me, "#services");
+               Me->Logs->AddLogType("*", l);
+       }
+       
+       virtual ~ModuleChanLog()
+       {
+               delete l;
+       }
+       
+       virtual Version GetVersion()
+       {
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+       }
+};
+
+
+MODULE_INIT(ModuleChanLog)
+