X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Ffilelogger.h;h=22a94c934cd3c288c4ea320e34dde0587d649437;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=d236fe3de4fd95a1886215c1634c9457f3079428;hpb=a969da5decb5855ca1c3a4ba4a4b4dfafb157e32;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/filelogger.h b/include/filelogger.h
index d236fe3de..22a94c934 100644
--- a/include/filelogger.h
+++ b/include/filelogger.h
@@ -1,23 +1,33 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *      the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __LOG_H__
-#define __LOG_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,
@@ -29,81 +39,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
-{
- 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, FILE *f, const std::string &type) : LogStream(Instance, type)
-	{
-		this->f = new FileLogger(Instance, f);
-	}
+	FileLogStream(int loglevel, FileWriter *fw);
 
-	~FileLogStream()
-	{
-		delete this->f;
-	}
+	virtual ~FileLogStream();
 
-	virtual void OnLog(int loglevel, const std::string &msg);
+	virtual void OnLog(int loglevel, const std::string &type, const std::string &msg);
 };
 
 #endif
+