From 97c2e0957d32c87e1055041e43eb13a4a26d0765 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 10 Mar 2011 19:20:58 -0500 Subject: [PATCH] Bug #1251 - Fixed logging inspircd logging us logging inspircd. Also moved the Server::Find messages to debug level 2 --- modules/protocol/inspircd-ts6.h | 9 +++++++++ src/servers.cpp | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/protocol/inspircd-ts6.h b/modules/protocol/inspircd-ts6.h index dda07f5a2..f0fb0addd 100644 --- a/modules/protocol/inspircd-ts6.h +++ b/modules/protocol/inspircd-ts6.h @@ -289,6 +289,15 @@ class InspircdIRCdMessage : public IRCdMessage return true; } + bool OnPrivmsg(const Anope::string &source, const std::vector ¶ms) + { + /* Ignore privmsgs from the server, which can happen. */ + if (Server::Find(source) != NULL) + return true; + + return IRCdMessage::OnPrivmsg(source, params); + } + /* * [Nov 04 00:08:46.308435 2009] debug: Received: SERVER irc.inspircd.com pass 0 964 :Testnet Central! * 0: name diff --git a/src/servers.cpp b/src/servers.cpp index 51ec8466a..b968cb0e7 100644 --- a/src/servers.cpp +++ b/src/servers.cpp @@ -261,7 +261,7 @@ bool Server::IsULined() const */ Server *Server::Find(const Anope::string &name, Server *s) { - Log(LOG_DEBUG) << "Server::Find called for " << name; + Log(LOG_DEBUG_2) << "Server::Find called for " << name; if (!s) s = Me; @@ -276,7 +276,7 @@ Server *Server::Find(const Anope::string &name, Server *s) if (serv->GetName().equals_cs(name) || serv->GetSID().equals_cs(name)) return serv; - Log(LOG_DEBUG) << "Server::Find checking " << serv->GetName() << " server tree for " << name; + Log(LOG_DEBUG_2) << "Server::Find checking " << serv->GetName() << " server tree for " << name; Server *server = Server::Find(name, serv); if (server) return server;