From 2aae57ca07b3de40feb72a21b2f2dea521665d80 Mon Sep 17 00:00:00 2001 From: danieldg Date: Tue, 19 Jan 2010 15:16:33 +0000 Subject: [PATCH] ERROR is not a valid log level, so all these messages were getting dropped git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12304 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/commands.cpp | 2 +- src/inspsocket.cpp | 2 +- src/mode.cpp | 2 +- src/modules.cpp | 4 ++-- src/modules/m_spanningtree/postcommand.cpp | 4 ++-- src/socket.cpp | 2 +- src/users.cpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/commands.cpp b/src/commands.cpp index b3a75424e..b595a4b46 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -117,7 +117,7 @@ CmdResult SplitCommand::Handle(const std::vector& parms, User* u) return HandleRemote(parms, IS_REMOTE(u)); if (IS_SERVER(u)) return HandleServer(parms, IS_SERVER(u)); - ServerInstance->Logs->Log("COMMAND", ERROR, "Unknown user type in command (uuid=%s)!", u->uuid.c_str()); + ServerInstance->Logs->Log("COMMAND", DEFAULT, "Unknown user type in command (uuid=%s)!", u->uuid.c_str()); return CMD_INVALID; } diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 8d03004a7..5099df882 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -533,7 +533,7 @@ void StreamSocket::HandleEvent(EventType et, int errornum) } catch (CoreException& ex) { - ServerInstance->Logs->Log("SOCKET", ERROR, "Caught exception in socket processing on FD %d - '%s'", + ServerInstance->Logs->Log("SOCKET", DEFAULT, "Caught exception in socket processing on FD %d - '%s'", fd, ex.GetReason()); SetError(ex.GetReason()); } diff --git a/src/mode.cpp b/src/mode.cpp index 6dea66464..9973df411 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -62,7 +62,7 @@ CullResult ModeHandler::cull() ModeHandler::~ModeHandler() { if (ServerInstance && ServerInstance->Modes && ServerInstance->Modes->FindMode(mode, m_type) == this) - ServerInstance->Logs->Log("MODE", ERROR, "ERROR: Destructor for mode %c called while still registered", mode); + ServerInstance->Logs->Log("MODE", DEFAULT, "ERROR: Destructor for mode %c called while still registered", mode); } bool ModeHandler::IsListMode() diff --git a/src/modules.cpp b/src/modules.cpp index fab9e2955..656e7ce90 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -175,7 +175,7 @@ ModuleManager::~ModuleManager() bool ModuleManager::Attach(Implementation i, Module* mod) { if (Modules.find(mod->ModuleSourceFile) == Modules.end()) - ServerInstance->Logs->Log("MODULE", ERROR, "Module %s is attaching to hook %d in constructor; this does not handle exceptions correctly!", mod->ModuleSourceFile.c_str(), i); + ServerInstance->Logs->Log("MODULE", DEFAULT, "Module %s is attaching to hook %d in constructor; this does not handle exceptions correctly!", mod->ModuleSourceFile.c_str(), i); if (std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod) != EventHandlers[i].end()) return false; @@ -424,7 +424,7 @@ void ModuleManager::AddService(ServiceProvider& item) { Module* owner = item.creator; if (Modules.find(owner->ModuleSourceFile) == Modules.end()) - ServerInstance->Logs->Log("MODULE", ERROR, "Module %s is registering item %s in constructor; this does not handle exceptions correctly!", owner->ModuleSourceFile.c_str(), item.name.c_str()); + ServerInstance->Logs->Log("MODULE", DEFAULT, "Module %s is registering item %s in constructor; this does not handle exceptions correctly!", owner->ModuleSourceFile.c_str(), item.name.c_str()); switch (item.service) { diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp index 5688b840c..63a8d76c3 100644 --- a/src/modules/m_spanningtree/postcommand.cpp +++ b/src/modules/m_spanningtree/postcommand.cpp @@ -66,7 +66,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string & TreeServer* sdest = FindServer(routing.serverdest); if (!sdest) { - ServerInstance->Logs->Log("m_spanningtree",ERROR,"Trying to route ENCAP to nonexistant server %s", + ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Trying to route ENCAP to nonexistant server %s", routing.serverdest.c_str()); return; } @@ -81,7 +81,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string & if (!(ver.Flags & (VF_COMMON | VF_CORE)) && srcmodule != Creator) { - ServerInstance->Logs->Log("m_spanningtree",ERROR,"Routed command %s from non-VF_COMMON module %s", + ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Routed command %s from non-VF_COMMON module %s", command.c_str(), srcmodule->ModuleSourceFile.c_str()); return; } diff --git a/src/socket.cpp b/src/socket.cpp index ca29b9ed1..0f2fbea22 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -123,7 +123,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports) n++; if (n == ports.end()) { - this->Logs->Log("SOCKET",ERROR,"Port bindings slipped out of vector, aborting close!"); + this->Logs->Log("SOCKET",DEFAULT,"Port bindings slipped out of vector, aborting close!"); break; } diff --git a/src/users.cpp b/src/users.cpp index b9d454c8b..73c441437 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -236,7 +236,7 @@ LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::so User::~User() { if (ServerInstance->Users->uuidlist->find(uuid) != ServerInstance->Users->uuidlist->end()) - ServerInstance->Logs->Log("USERS", ERROR, "User destructor for %s called without cull", uuid.c_str()); + ServerInstance->Logs->Log("USERS", DEFAULT, "User destructor for %s called without cull", uuid.c_str()); } const std::string& User::MakeHost() -- 2.39.5