X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Ffilelogger.h;h=45c96bc9f25ea8c65e4afa4b3b89d8229d952454;hb=d383ce9b72bf5c58bb0571998b282cf67cf7635c;hp=36e50b11c3c716371e502fcff31a3917d3885893;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/filelogger.h b/include/filelogger.h
index 36e50b11c..45c96bc9f 100644
--- a/include/filelogger.h
+++ b/include/filelogger.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *      the file COPYING for details.
@@ -11,19 +11,16 @@
  * ---------------------------------------------------
  */
 
-#ifndef __LOG_H__
-#define __LOG_H__
-
-#include <time.h>
-#include <string>
-#include <sstream>
-#include "socketengine.h"
+#ifndef FILELOGGER_H
+#define FILELOGGER_H
 
+#include "logger.h"
 
 /** Debug levels for use with InspIRCd::Log()
  *  */
 enum DebugLevel
 {
+    RAWIO       =   5,
     DEBUG       =   10,
     VERBOSE     =   20,
     DEFAULT     =   30,
@@ -35,64 +32,19 @@ 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.
+/** A logging class which logs to a streamed file.
  */
-class CoreExport FileLogger : public EventHandler
+class CoreExport FileLogStream : public LogStream
 {
- 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;
+ private:
+	FileWriter *f;
  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();
-};
+	FileLogStream(int loglevel, FileWriter *fw);
 
+	virtual ~FileLogStream();
+
+	virtual void OnLog(int loglevel, const std::string &type, const std::string &msg);
+};
 
 #endif
+