3 files changed, 15 insertions, 6 deletions
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<std::string, std::vector<LogStream *> > LogStreams;
+	std::vector<LogStream *> GlobalLogStreams; //holds all logstreams with a type of *
  public:
 	LogManager(InspIRCd *Instance)
 	{