X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Flogger.h;h=37020a4ffb04404cdf09792ea46812545997afd7;hb=74066e0f563ef630e432d3bbb10544318b70ade3;hp=25dcea85ff23e423cbc8e2091b79df9d94104a7a;hpb=58385dd458e927994957b6d603f7f9da3fc52e14;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/logger.h b/include/logger.h
index 25dcea85f..37020a4ff 100644
--- a/include/logger.h
+++ b/include/logger.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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -29,19 +29,11 @@
 class CoreExport FileWriter : 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;
@@ -49,11 +41,7 @@ class CoreExport FileWriter : public EventHandler
  public:
 	/** The constructor takes an already opened logfile.
 	 */
-	FileWriter(InspIRCd* Instance, FILE* logfile);
-
-	/** This returns false, logfiles are writeable.
-	 */
-	virtual bool Readable();
+	FileWriter(FILE* logfile);
 
 	/** Handle pending write events.
 	 * This will flush any waiting data to disk.
@@ -77,7 +65,6 @@ class CoreExport FileWriter : public EventHandler
 	virtual void Close();
 
 	/** Close the log file and cancel any events.
-	 * (indirectly call Close()
 	 */
 	virtual ~FileWriter();
 };
@@ -105,10 +92,9 @@ class CoreExport FileWriter : public EventHandler
 class CoreExport LogStream : public classbase
 {
  protected:
-	InspIRCd *ServerInstance;
 	int loglvl;
  public:
-	LogStream(InspIRCd *Instance, int loglevel) : ServerInstance(Instance), loglvl(loglevel)
+	LogStream(int loglevel) : loglvl(loglevel)
 	{
 	}
 
@@ -142,8 +128,6 @@ class CoreExport LogManager : public classbase
 	 */
 	LogStream* noforkstream;
 
-	InspIRCd *ServerInstance;
-
 	/** Map of active log types and what LogStreams will receive them.
 	 */
 	std::map<std::string, std::vector<LogStream *> > LogStreams;
@@ -163,12 +147,18 @@ class CoreExport LogManager : public classbase
 
  public:
 
-	LogManager(InspIRCd *Instance)
+	LogManager()
 	{
-		ServerInstance = Instance;
+		noforkstream = NULL;
 		Logging = false;
 	}
 
+	~LogManager()
+	{
+		if (noforkstream)
+			delete noforkstream;
+	}
+
 	/** Sets up the logstream for -nofork. Called by InspIRCd::OpenLog() and LogManager::OpenFileLogs().
 	 * First time called it creates the nofork stream and stores it in noforkstream. Each call thereafter just readds it to GlobalLogStreams
 	 * and updates the loglevel.