X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Ffilelogger.h;h=3100761d9a22901c2ebc94ae6e98c30d684bf616;hb=8c2d96013084de950e3a63be4ae6ed626c4093ab;hp=a2d63a0d997c6991fc134228e8adc19e8ed5e1d7;hpb=f63580a4eaa8d079200065dffa4d6a33b5577427;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/filelogger.h b/include/filelogger.h
index a2d63a0d9..3100761d9 100644
--- a/include/filelogger.h
+++ b/include/filelogger.h
@@ -14,6 +14,8 @@
 #ifndef __LOG_H__
 #define __LOG_H__
 
+#include "logger.h"
+
 /** Debug levels for use with InspIRCd::Log()
  *  */
 enum DebugLevel
@@ -29,79 +31,14 @@ enum DebugLevel
 /* Forward declaration -- required */
 class InspIRCd;
 
-/** This class implements a nonblocking log-writer.
- * Most people writing an ircd give little thought to their disk
- * i/o. On a congested system, disk writes can block for long
- * periods of time (e.g. if the system is busy and/or swapping
- * a lot). If we just use a blocking fprintf() call, this could
- * block for undesirable amounts of time (half of a second through
- * to whole seconds). We DO NOT want this, so we make our logfile
- * nonblocking and hook it into the SocketEngine.
- * NB: If the operating system does not support nonblocking file
- * I/O (linux seems to, as does freebsd) this will default to
- * blocking behaviour.
- */
-class CoreExport FileLogger : public EventHandler
-{
- protected:
-	/** The creator/owner of this object
-	 */
-	InspIRCd* ServerInstance;
-	/** The log file (fd is inside this somewhere,
-	 * we get it out with fileno())
-	 */
-	FILE* log;
-	/** Buffer of pending log lines to be written
-	 */
-	std::string buffer;
-	/** Number of write operations that have occured
-	 */
-	int writeops;
- public:
-	/** The constructor takes an already opened logfile.
-	 */
-	FileLogger(InspIRCd* Instance, FILE* logfile);
-	/** This returns false, logfiles are writeable.
-	 */
-	virtual bool Readable();
-	/** Handle pending write events.
-	 * This will flush any waiting data to disk.
-	 * If any data remains after the fprintf call,
-	 * another write event is scheduled to write
-	 * the rest of the data when possible.
-	 */
-	virtual void HandleEvent(EventType et, int errornum = 0);
-	/** Write one or more preformatted log lines.
-	 * If the data cannot be written immediately,
-	 * this class will insert itself into the
-	 * SocketEngine, and register a write event,
-	 * and when the write event occurs it will
-	 * attempt again to write the data.
-	 */
-	void WriteLogLine(const std::string &line);
-	/** Close the log file and cancel any events.
-	 */
-	virtual void Close();
-	/** Close the log file and cancel any events.
-	 * (indirectly call Close()
-	 */
-	virtual ~FileLogger();
-};
-
 class CoreExport FileLogStream : public LogStream
 {
  private:
-	FileLogger *f;
+	FileWriter *f;
  public:
-	FileLogStream(InspIRCd *Instance, int loglevel, FILE *f) : LogStream(Instance, loglevel)
-	{
-		this->f = new FileLogger(Instance, f);
-	}
+	FileLogStream(InspIRCd *Instance, int loglevel, FileWriter *fw);
 
-	~FileLogStream()
-	{
-		delete this->f;
-	}
+	virtual ~FileLogStream();
 
 	virtual void OnLog(int loglevel, const std::string &type, const std::string &msg);
 };