X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=67faee8f54371fd77dc814cf56c5c8e79ac413ab;hb=6d6f0ef3c67974e14cc226a442e09b2d0cb37146;hp=d274dd2446557e8e62c74edafd65331cdff7f08c;hpb=af7e1a1ca8b36064593becf62b1a91468ad32237;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index d274dd244..67faee8f5 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -18,28 +18,6 @@
 #include "xline.h"
 #include "exitcodes.h"
 
-/** Log()
- *  Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
- *  is greater than the configured loglevel.
- */
-void InspIRCd::Log(int level, const char* text, ...)
-{
-	va_list argsPtr;
-	char textbuffer[65536];
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, 65536, text, argsPtr);
-	va_end(argsPtr);
-
-	this->Log(level, std::string(textbuffer));
-}
-
-void InspIRCd::Log(int level, const std::string &text)
-{
-	this->Logs->Log("WARNING", DEFAULT, "Deprecated call to InspIRCd::Log()! - log message follows");
-	this->Logs->Log("DEPRECATED", level, text);
-}
-
 std::string InspIRCd::GetServerDescription(const char* servername)
 {
 	std::string description;
@@ -303,6 +281,12 @@ bool InspIRCd::IsSID(const std::string &str)
 /* open the proper logfile */
 bool InspIRCd::OpenLog(char**, int)
 {
+	/* This function only happens at startup now (log reopening is done at OnReadConfig stage now instead of rehash) */
+	if (Config->nofork)
+	{
+		this->Logs->SetupNoFork();
+	}
+	if (!Config->writelog) return true; // Skip opening default log if -nolog
 	Config->MyDir = Config->GetFullProgDir();
 
 	if (!*this->LogFileName)
@@ -324,8 +308,11 @@ bool InspIRCd::OpenLog(char**, int)
 		return false;
 	}
 
-	FileLogStream *f = new FileLogStream(this, Config->log_file, "*");
-	this->Logs->AddLogType("*", f);
+	FileWriter* fw = new FileWriter(this, Config->log_file);
+	FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : Config->LogLevel), fw);
+
+	this->Logs->AddLogType("*", f, true);
+
 	return true;
 }
 
@@ -334,7 +321,7 @@ void InspIRCd::CheckRoot()
 	if (geteuid() == 0)
 	{
 		printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
-		this->Log(DEFAULT,"Cant start as root");
+		this->Logs->Log("STARTUP",DEFAULT,"Cant start as root");
 		Exit(EXIT_STATUS_ROOT);
 	}
 }
@@ -344,7 +331,7 @@ void InspIRCd::CheckDie()
 	if (*Config->DieValue)
 	{
 		printf("WARNING: %s\n\n",Config->DieValue);
-		this->Log(DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
+		this->Logs->Log("CONFIG",DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
 		Exit(EXIT_STATUS_DIETAG);
 	}
 }
@@ -414,19 +401,19 @@ long InspIRCd::Duration(const std::string &str)
 	return total + subtotal;
 }
 
-bool InspIRCd::ULine(const char* server)
+bool InspIRCd::ULine(const char* sserver)
 {
-	if (!server)
+	if (!sserver)
 		return false;
-	if (!*server)
+	if (!*sserver)
 		return true;
 
-	return (Config->ulines.find(server) != Config->ulines.end());
+	return (Config->ulines.find(sserver) != Config->ulines.end());
 }
 
-bool InspIRCd::SilentULine(const char* server)
+bool InspIRCd::SilentULine(const char* sserver)
 {
-	std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
+	std::map<irc::string,bool>::iterator n = Config->ulines.find(sserver);
 	if (n != Config->ulines.end())
 		return n->second;
 	else return false;