/* $Core: libIRCDhelper */
#include "inspircd.h"
-#include <stdarg.h>
#include "wildcard.h"
#include "xline.h"
#include "exitcodes.h"
-static char TIMESTR[26];
-static time_t LAST = 0;
-
/** 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, ...)
{
- /* sanity check, just in case */
- if (!this->Config || !this->Logger)
- return;
-
- /* Do this check again here so that we save pointless vsnprintf calls */
- if ((level < Config->LogLevel) && !Config->forcedebug)
- return;
-
va_list argsPtr;
char textbuffer[65536];
void InspIRCd::Log(int level, const std::string &text)
{
- /* sanity check, just in case */
- if (!this->Config || !this->Logger)
- return;
-
- /* If we were given -debug we output all messages, regardless of configured loglevel */
- if ((level < Config->LogLevel) && !Config->forcedebug)
- return;
-
- if (Time() != LAST)
- {
- time_t local = Time();
- struct tm *timeinfo = localtime(&local);
-
- strlcpy(TIMESTR,asctime(timeinfo),26);
- TIMESTR[24] = ':';
- LAST = Time();
- }
-
- if (Config->log_file && Config->writelog)
- {
- std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n";
- this->Logger->WriteLogLine(out);
- }
-
- if (Config->nofork)
- {
- printf("%s %s\n", TIMESTR, text.c_str());
- }
+ this->Logs->Log("DEPRECATED", level, "Deprecated use of InspIRCd::Log(), message = %s", text.c_str());
}
std::string InspIRCd::GetServerDescription(const char* servername)
}
}
-void InspIRCd::ServerNoticeAll(char* text, ...)
-{
- if (!text)
- return;
-
- char textbuffer[MAXBUF];
- char formatbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
-
- for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
- {
- User* t = *i;
- t->WriteServ(std::string(formatbuffer));
- }
-}
-
-void InspIRCd::ServerPrivmsgAll(char* text, ...)
-{
- if (!text)
- return;
-
- char textbuffer[MAXBUF];
- char formatbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
-
- for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
- {
- User* t = *i;
- t->WriteServ(std::string(formatbuffer));
- }
-}
-
-void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
-{
- char textbuffer[MAXBUF];
- int modelen;
- va_list argsPtr;
-
- if (!text || !modes || !flags)
- {
- this->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
- return;
- }
-
- va_start(argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
- modelen = strlen(modes);
-
- if (flags == WM_AND)
- {
- for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
- {
- User* t = *i;
- bool send_to_user = true;
-
- for (int n = 0; n < modelen; n++)
- {
- if (!t->IsModeSet(modes[n]))
- {
- send_to_user = false;
- break;
- }
- }
- if (send_to_user)
- {
- t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
- }
- }
- }
- else if (flags == WM_OR)
- {
- for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
- {
- User* t = *i;
- bool send_to_user = false;
-
- for (int n = 0; n < modelen; n++)
- {
- if (t->IsModeSet(modes[n]))
- {
- send_to_user = true;
- break;
- }
- }
-
- if (send_to_user)
- {
- t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
- }
- }
- }
-}
-
/* Find a user record by nickname and return a pointer to it */
User* InspIRCd::FindNick(const std::string &nick)
{
if (!nick.empty() && isdigit(*nick.begin()))
return FindUUID(nick);
- user_hash::iterator iter = clientlist->find(nick);
+ user_hash::iterator iter = this->Users->clientlist->find(nick);
- if (iter == clientlist->end())
+ if (iter == this->Users->clientlist->end())
/* Couldn't find it */
return NULL;
if (isdigit(*nick))
return FindUUID(nick);
- user_hash::iterator iter = clientlist->find(nick);
+ user_hash::iterator iter = this->Users->clientlist->find(nick);
- if (iter == clientlist->end())
+ if (iter == this->Users->clientlist->end())
return NULL;
return iter->second;
User* InspIRCd::FindNickOnly(const std::string &nick)
{
- user_hash::iterator iter = clientlist->find(nick);
+ user_hash::iterator iter = this->Users->clientlist->find(nick);
- if (iter == clientlist->end())
+ if (iter == this->Users->clientlist->end())
return NULL;
return iter->second;
User* InspIRCd::FindNickOnly(const char* nick)
{
- user_hash::iterator iter = clientlist->find(nick);
+ user_hash::iterator iter = this->Users->clientlist->find(nick);
- if (iter == clientlist->end())
+ if (iter == this->Users->clientlist->end())
return NULL;
return iter->second;
User *InspIRCd::FindUUID(const char *uid)
{
- user_hash::iterator finduuid = uuidlist->find(uid);
+ user_hash::iterator finduuid = this->Users->uuidlist->find(uid);
- if (finduuid == uuidlist->end())
+ if (finduuid == this->Users->uuidlist->end())
return NULL;
return finduuid->second;
/* Send an error notice to all users, registered or not */
void InspIRCd::SendError(const std::string &s)
{
- for (std::vector<User*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+ for (std::vector<User*>::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++)
{
if ((*i)->registered == REG_ALL)
{
}
}
-/* return how many users have a given mode e.g. 'a' */
-int InspIRCd::ModeCount(const char mode)
-{
- ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER);
-
- if (mh)
- return mh->GetCount();
- else
- return 0;
-}
-
/* return channel count */
long InspIRCd::ChannelCount()
{
/* 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)
if (!Config->log_file)
{
- this->Logger = NULL;
return false;
}
- this->Logger = new FileLogger(this, Config->log_file);
+ 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;
}
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);
}
}
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);
}
}
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;