* 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.
*
* ---------------------------------------------------
*/
#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("DEPRECATED", level, "Deprecated use of InspIRCd::Log(), message = %s", text.c_str());
-}
-
std::string InspIRCd::GetServerDescription(const char* servername)
{
std::string description;
}
/* true for valid channel name, false else */
-bool InspIRCd::IsChannel(const char *chname)
+bool IsChannelHandler::Call(const char *chname)
{
char *c;
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
/* 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) */
+ /* This function only happens at startup now */
if (Config->nofork)
{
this->Logs->SetupNoFork();
}
- if (!Config->writelog) return true; // Skip opening default log if -nolog
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))
+ {
+ /* 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+");
}
FileWriter* fw = new FileWriter(this, Config->log_file);
- FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : Config->LogLevel), fw);
+ FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw);
this->Logs->AddLogType("*", f, true);