#else
if (signal == SIGHUP)
{
- Rehash("Caught SIGHUP");
+ ServerInstance->SNO->WriteGlobalSno('a', "Rehashing due to SIGHUP");
+ Rehash();
}
else if (signal == SIGTERM)
#endif
exit (status);
}
-void RehashHandler::Call(const std::string &reason)
+void InspIRCd::Rehash(const std::string& uuid)
{
- ServerInstance->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()), reason.c_str());
- FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
if (!ServerInstance->ConfigThread)
{
- ServerInstance->ConfigThread = new ConfigReaderThread("");
+ ServerInstance->ConfigThread = new ConfigReaderThread(uuid);
ServerInstance->Threads->Start(ServerInstance->ConfigThread);
}
}
std::string InspIRCd::GetVersionString(bool getFullVersion)
{
if (getFullVersion)
- return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," + SE->GetName() + "," + Config->sid + "]";
+ return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
return BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
}
tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway);
tokens["CASEMAPPING"] = "rfc1459";
- tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MASK_CHANNEL);
+ tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL);
tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
tokens["CHANTYPES"] = "#";
- tokens["CHARSET"] = "ascii";
tokens["ELIST"] = "MU";
tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick);
tokens["MAXBANS"] = "64"; // TODO: make this a config setting.
tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
- tokens["FNC"] = tokens["MAP"] = tokens["VBANLIST"] =
+ tokens["FNC"] = tokens["VBANLIST"] =
tokens["WALLCHOPS"] = tokens["WALLVOICES"];
// Modules can add new tokens and also edit or remove existing tokens
- FOREACH_MOD(I_On005Numeric, On005Numeric(tokens));
+ FOREACH_MOD(On005Numeric, (tokens));
// EXTBAN is a special case as we need to sort it and prepend a comma.
std::map<std::string, std::string>::iterator extban = tokens.find("EXTBAN");
void ISupportManager::SendTo(LocalUser* user)
{
for (std::vector<std::string>::const_iterator i = this->Lines.begin(); i != this->Lines.end(); ++i)
- user->WriteNumeric(RPL_ISUPPORT, "%s %s", user->nick.c_str(), i->c_str());
+ user->WriteNumeric(RPL_ISUPPORT, *i);
}