diff options
| -rw-r--r-- | include/inspircd.h | 3 | ||||
| -rw-r--r-- | src/cmd_rehash.cpp | 3 | ||||
| -rw-r--r-- | src/helperfuncs.cpp | 11 | ||||
| -rw-r--r-- | src/inspircd.cpp | 38 | ||||
| -rw-r--r-- | src/server.cpp | 3 |
5 files changed, 37 insertions, 21 deletions
diff --git a/include/inspircd.h b/include/inspircd.h index cb40e2734..38ec9cf43 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -640,8 +640,9 @@ class CoreExport InspIRCd : public classbase /** Determine the right path for, and open, the logfile * @param argv The argv passed to main() initially, used to calculate program path * @param argc The argc passed to main() initially, used to calculate program path + * @return True if the log could be opened, false if otherwise */ - void OpenLog(char** argv, int argc); + bool OpenLog(char** argv, int argc); /** Close the currently open log file */ diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp index 34789b0ea..6e214be0a 100644 --- a/src/cmd_rehash.cpp +++ b/src/cmd_rehash.cpp @@ -37,7 +37,8 @@ CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user) { ServerInstance->WriteOpers("*** %s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName)); ServerInstance->CloseLog(); - ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc); + if (!ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc)) + user->WriteServ("*** NOTICE %s :ERROR: Could not open logfile %s: %s", user->nick, ServerInstance->Config->logpath.c_str(), strerror(errno)); ServerInstance->RehashUsersAndChans(); FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect()); ServerInstance->Config->Read(false,user); diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 7fba47699..9363e3376 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -31,7 +31,7 @@ static time_t LAST = 0; void InspIRCd::Log(int level, const char* text, ...) { /* sanity check, just in case */ - if (!this->Config) + if (!this->Config || !this->Logger) return; /* Do this check again here so that we save pointless vsnprintf calls */ @@ -51,7 +51,7 @@ void InspIRCd::Log(int level, const char* text, ...) void InspIRCd::Log(int level, const std::string &text) { /* sanity check, just in case */ - if (!this->Config) + if (!this->Config || !this->Logger) return; /* If we were given -debug we output all messages, regardless of configured loglevel */ @@ -442,7 +442,7 @@ bool IsIdentHandler::Call(const char* n) } /* open the proper logfile */ -void InspIRCd::OpenLog(char** argv, int argc) +bool InspIRCd::OpenLog(char** argv, int argc) { Config->MyDir = Config->GetFullProgDir(); @@ -462,11 +462,12 @@ void InspIRCd::OpenLog(char** argv, int argc) if (!Config->log_file) { - printf("ERROR: Could not write to logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno)); - exit(EXIT_STATUS_LOG); + this->Logger = NULL; + return false; } this->Logger = new FileLogger(this, Config->log_file); + return true; } void InspIRCd::CheckRoot() diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 6d7a26579..4c19878d7 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -77,13 +77,16 @@ void InspIRCd::Cleanup() std::vector<std::string> mymodnames; int MyModCount = this->GetModuleCount(); - for (unsigned int i = 0; i < Config->ports.size(); i++) + if (Config) { - /* This calls the constructor and closes the listening socket */ - delete Config->ports[i]; - } + for (unsigned int i = 0; i < Config->ports.size(); i++) + { + /* This calls the constructor and closes the listening socket */ + delete Config->ports[i]; + } - Config->ports.clear(); + Config->ports.clear(); + } /* Close all client sockets, or the new process inherits them */ for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) @@ -101,16 +104,20 @@ void InspIRCd::Cleanup() MyModCount = this->GetModuleCount(); mymodnames.clear(); - /* Unload all modules, so they get a chance to clean up their listeners */ - for (int j = 0; j <= MyModCount; j++) - mymodnames.push_back(Config->module_names[j]); + if (MyModCount) + { + /* Unload all modules, so they get a chance to clean up their listeners */ + for (int j = 0; j <= MyModCount; j++) + mymodnames.push_back(Config->module_names[j]); - for (int k = 0; k <= MyModCount; k++) - this->UnloadModule(mymodnames[k].c_str()); + for (int k = 0; k <= MyModCount; k++) + this->UnloadModule(mymodnames[k].c_str()); + } } /* Close logging */ - this->Logger->Close(); + if (this->Logger) + this->Logger->Close(); /* Cleanup Server Names */ for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr) @@ -183,7 +190,8 @@ void InspIRCd::RehashUsersAndChans() void InspIRCd::CloseLog() { - this->Logger->Close(); + if (this->Logger) + this->Logger->Close(); } void InspIRCd::SetSignals() @@ -411,7 +419,11 @@ InspIRCd::InspIRCd(int argc, char** argv) strlcpy(Config->MyExecutable,argv[0],MAXBUF); - this->OpenLog(argv, argc); + if (!this->OpenLog(argv, argc)) + { + printf("ERROR: Could not open logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno)); + Exit(EXIT_STATUS_LOG); + } this->stats = new serverstats(); this->Timers = new TimerManager(this); diff --git a/src/server.cpp b/src/server.cpp index f259e4435..b3b02f507 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -46,7 +46,8 @@ void InspIRCd::Rehash() { this->WriteOpers("*** Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName)); this->CloseLog(); - this->OpenLog(this->Config->argv, this->Config->argc); + if (!this->OpenLog(this->Config->argv, this->Config->argc)) + this->WriteOpers("*** ERROR: Could not open logfile %s: %s", Config->logpath.c_str(), strerror(errno)); this->RehashUsersAndChans(); FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect()); this->Config->Read(false,NULL); |