From af7e1a1ca8b36064593becf62b1a91468ad32237 Mon Sep 17 00:00:00 2001 From: w00t Date: Sat, 9 Feb 2008 12:41:17 +0000 Subject: New logging implementation. Also write messages about InspIRCd::Log() being deprecated. Any takers on changing it all to use the new system? :P. STILL TODO: create blocks in config, add a method called to 'cleanup' (or use destructor) of logstreams, add a method to logmanager to initiate destruction of all logstreams. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8858 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/filelogger.h | 12 ++++++++++++ include/inspircd.h | 4 ---- include/logger.h | 5 +++-- 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/filelogger.h b/include/filelogger.h index 77ca6f886..8395f1c96 100644 --- a/include/filelogger.h +++ b/include/filelogger.h @@ -88,5 +88,17 @@ class CoreExport FileLogger : public EventHandler virtual ~FileLogger(); }; +class CoreExport FileLogStream : public LogStream +{ + private: + FileLogger *f; + public: + FileLogStream(InspIRCd *Instance, FILE *f, const std::string &type) : LogStream(Instance, type) + { + this->f = new FileLogger(Instance, f); + } + + virtual void OnLog(int loglevel, const std::string &msg); +}; #endif diff --git a/include/inspircd.h b/include/inspircd.h index e8d5c9b8e..5f57619d5 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -304,10 +304,6 @@ class CoreExport InspIRCd : public classbase */ socklen_t length; - /** Nonblocking file writer - */ - FileLogger* Logger; - /** Time offset in seconds * This offset is added to all calls to Time(). Use SetTimeDelta() to update */ diff --git a/include/logger.h b/include/logger.h index 1e043f4f1..d32c3d184 100644 --- a/include/logger.h +++ b/include/logger.h @@ -16,7 +16,7 @@ class CoreExport LogStream : public classbase { - private: + protected: InspIRCd *ServerInstance; std::string type; public: @@ -26,7 +26,7 @@ class CoreExport LogStream : public classbase this->type = type; } - virtual void OnLog(int loglevel, const std::string &msg); + virtual void OnLog(int loglevel, const std::string &msg) { } }; class CoreExport LogManager : public classbase @@ -34,6 +34,7 @@ class CoreExport LogManager : public classbase private: InspIRCd *ServerInstance; std::map > LogStreams; + std::vector GlobalLogStreams; //holds all logstreams with a type of * public: LogManager(InspIRCd *Instance) { -- cgit v1.2.3