From dbe93e44775c4a274d329e152babd8330dadcbf8 Mon Sep 17 00:00:00 2001
From: brain
Date: Sat, 16 Dec 2006 21:40:06 +0000
Subject: Add stuff so that the core catches CoreException properly

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6017 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/users.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/users.cpp')

diff --git a/src/users.cpp b/src/users.cpp
index 1abbcc37a..4a77b450f 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -153,7 +153,7 @@ void userrec::StartDNSLookup()
 		res_reverse = new UserResolver(this->ServerInstance, this, this->GetIPString(), DNS_QUERY_REVERSE);
 		this->ServerInstance->AddResolver(res_reverse);
 	}
-	catch (ModuleException& e)
+	catch (CoreException& e)
 	{
 		ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
 	}
@@ -186,7 +186,7 @@ void UserResolver::OnLookupComplete(const std::string &result)
 				this->ServerInstance->AddResolver(bound_user->res_forward);
 			}
 		}
-		catch (ModuleException& e)
+		catch (CoreException& e)
 		{
 			ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
 		}
@@ -791,9 +791,9 @@ void userrec::QuitUser(InspIRCd* Instance, userrec *user, const std::string &qui
 			{
 				Instance->Config->GetIOHook(user->GetPort())->OnRawSocketClose(user->fd);
 			}
-			catch (ModuleException& modexcept)
+			catch (CoreException& modexcept)
 			{
-				Instance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
+				Instance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 			}
 		}
 		
@@ -1445,9 +1445,9 @@ void userrec::Write(std::string text)
 		{
 			ServerInstance->Config->GetIOHook(this->GetPort())->OnRawSocketWrite(this->fd, text.data(), text.length());
 		}
-		catch (ModuleException& modexcept)
+		catch (CoreException& modexcept)
 		{
-			ServerInstance->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
+			ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 		}
 	}
 	else
-- 
cgit v1.3.1-10-gc9f91