Log some internal errors on DEFAULT loglevel instead of DEBUG, log detected errors in m_callerid

3 files changed, 22 insertions, 3 deletions

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 4b167f2db..37787b525 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -116,11 +116,16 @@ struct CallerIDExtInfo : public ExtensionItem
 			callerid_data *targ = this->get(*it, false);
 
 			if (!targ)
+			{
+				ServerInstance->Logs->Log("m_callerid", DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (1)");
 				continue; // shouldn't happen, but oh well.
+			}
 
 			std::list<callerid_data*>::iterator it2 = std::find(targ->wholistsme.begin(), targ->wholistsme.end(), dat);
 			if (it2 != targ->wholistsme.end())
 				targ->wholistsme.erase(it2);
+			else
+				ServerInstance->Logs->Log("m_callerid", DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)");
 		}
 		delete dat;
 	}
@@ -280,6 +285,7 @@ public:
 		if (!dat2)
 		{
 			// How the fuck is this possible.
+			ServerInstance->Logs->Log("m_callerid", DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (3)");
 			return false;
 		}
 
@@ -287,6 +293,9 @@ public:
 		if (it != dat2->wholistsme.end())
 			// Found me!
 			dat2->wholistsme.erase(it);
+		else
+			ServerInstance->Logs->Log("m_callerid", DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)");
+
 
 		user->WriteServ("NOTICE %s :%s is no longer on your accept list", user->nick.c_str(), whotoremove->nick.c_str());
 		return true;
@@ -324,6 +333,8 @@ private:
 
 			if (it2 != dat->accepting.end())
 				dat->accepting.erase(it2);
+			else
+				ServerInstance->Logs->Log("m_callerid", DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (5)");
 		}
 
 		userdata->wholistsme.clear();
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 2f2eeb6dd..e3ddfc9f2 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -167,13 +167,13 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 {
 	if (user->quitting)
 	{
-		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
+		ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Tried to quit quitting user: " + user->nick);
 		return;
 	}
 
 	if (IS_SERVER(user))
 	{
-		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str());
+		ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Tried to quit server user: " + user->nick);
 		return;
 	}
 
@@ -239,7 +239,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 	if (iter != this->clientlist->end())
 		this->clientlist->erase(iter);
 	else
-		ServerInstance->Logs->Log("USERS", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
+		ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Nick not found in clientlist, cannot remove: " + user->nick);
 
 	ServerInstance->Users->uuidlist->erase(user->uuid);
 }
diff --git a/src/users.cpp b/src/users.cpp
index dbc3ea444..f48e3642f 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -546,6 +546,8 @@ CullResult LocalUser::cull()
 	// is only a precaution currently.
 	if (localuseriter != ServerInstance->Users->local_users.end())
 		ServerInstance->Users->local_users.erase(localuseriter);
+	else
+		ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: LocalUserIter does not point to a valid entry for " + this->nick);
 
 	ClearInvites();
 	eh.cull();
@@ -840,6 +842,12 @@ void User::InvalidateCache()
 
 bool User::ChangeNick(const std::string& newnick, bool force)
 {
+	if (quitting)
+	{
+		ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Attempted to change nick of a quitting user: " + this->nick);
+		return false;
+	}
+
 	ModResult MOD_RESULT;
 
 	if (force)