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

[user/henk/code/inspircd.git] / include / logger.h

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();