X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=b0c96645736c543047004e9ef9dbc80fd4c0c43b;hb=67c9b1ba8404a3c7c7c1b223c188d56a3ae7d9e1;hp=6118c9f8f6431d1f1fecfdf499db3f558df9dd0d;hpb=8a3c523307558aedb977ca90fab69650eff54e1c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 6118c9f8f..b0c966457 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -6,7 +6,7 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -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;
@@ -204,7 +182,7 @@ bool InspIRCd::IsValidMask(const std::string &mask)
 }
 
 /* true for valid channel name, false else */
-bool InspIRCd::IsChannel(const char *chname)
+bool IsChannelHandler::Call(const char *chname)
 {
 	char *c;
 
@@ -290,7 +268,7 @@ bool IsIdentHandler::Call(const char* n)
 	return true;
 }
 
-bool InspIRCd::IsSID(const std::string &str)
+bool IsSIDHandler::Call(const std::string &str)
 {
 	/* Returns true if the string given is exactly 3 characters long,
 	 * starts with a digit, and the other two characters are A-Z or digits
@@ -303,13 +281,44 @@ bool InspIRCd::IsSID(const std::string &str)
 /* open the proper logfile */
 bool InspIRCd::OpenLog(char**, int)
 {
+	/* This function only happens at startup now */
+	if (Config->nofork)
+	{
+		this->Logs->SetupNoFork();
+	}
 	Config->MyDir = Config->GetFullProgDir();
 
+	/* Attempt to find home directory, portable to windows */
+	const char* home = getenv("HOME");
+	if (!home)
+	{
+		/* No $HOME, log to %USERPROFILE% */
+		home = getenv("USERPROFILE");
+		if (!home)
+		{
+			/* Nothing could be found at all, log to current dir */
+			Config->logpath = "./startup.log";
+		}
+	}
+
+	if (!Config->writelog) return true; // Skip opening default log if -nolog
+
 	if (!*this->LogFileName)
 	{
 		if (Config->logpath.empty())
 		{
-			Config->logpath = Config->MyDir + "/ircd.log";
+			std::string path = std::string(home) + "/.inspircd";
+			if (!mkdir(path.c_str(), 0700) && errno != EEXIST)
+			{
+				/* Log to ~/.inspircd/ircd.log */
+				Config->logpath = path + "/startup.log";
+			}
+			else
+			{
+				/* Couldn't make ~/.inspircd directory, log to current dir */
+				Config->logpath = "./startup.log";
+				printf("\nWARNING: Unable to create directory: %s (%s)\n", path.c_str(), strerror(errno));
+			}
 		}
 
 		Config->log_file = fopen(Config->logpath.c_str(),"a+");
@@ -324,8 +333,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 : DEFAULT), fw);
+
+	this->Logs->AddLogType("*", f, true);
+
 	return true;
 }
 
@@ -334,7 +346,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 +356,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 +426,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;