From 91f6b2e29d8fb354e6c93b987d99488f6bb69235 Mon Sep 17 00:00:00 2001
From: Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Sat, 10 Apr 2010 19:16:55 +0000
Subject: Made MySQL log errors when executing queries instead of crashing

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2881 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/modules/mysql/db_mysql_read.cpp | 53 +++++++++----------------------------
 1 file changed, 13 insertions(+), 40 deletions(-)

(limited to 'src/modules/mysql/db_mysql_read.cpp')

diff --git a/src/modules/mysql/db_mysql_read.cpp b/src/modules/mysql/db_mysql_read.cpp
index e34278e71..5c498b008 100644
--- a/src/modules/mysql/db_mysql_read.cpp
+++ b/src/modules/mysql/db_mysql_read.cpp
@@ -98,16 +98,9 @@ static void LoadDatabase()
 				Alog() << "MySQL: Got NickCore access entry for nonexistant core " << qres[i]["display"];
 				continue;
 			}
-			try
-			{
-				EventReturn MOD_RESULT;
-				std::vector<std::string> Params = MakeVector(SQLAssign(qres[i]["value"]));
-				FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(nc, SQLAssign(qres[i]["name"]), Params));
-			}
-			catch (const char *err)
-			{
-				Alog() << "[db_mysql_read]: " << err;
-			}
+			EventReturn MOD_RESULT;
+			std::vector<std::string> Params = MakeVector(SQLAssign(qres[i]["value"]));
+			FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(nc, SQLAssign(qres[i]["name"]), Params));
 		}
 	}
 
@@ -160,16 +153,9 @@ static void LoadDatabase()
 				Alog() << "MySQL: Got metadata for nonexistant nick " << qres[i]["nick"];
 				continue;
 			}
-			try
-			{
-				EventReturn MOD_RESULT;
-				std::vector<std::string> Params = MakeVector(SQLAssign(qres[i]["value"]));
-				FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(na, SQLAssign(qres[i]["name"]), Params));
-			}
-			catch (const char *err)
-			{
-				Alog() << "[db_mysql_read]: " << err;
-			}
+			EventReturn MOD_RESULT;
+			std::vector<std::string> Params = MakeVector(SQLAssign(qres[i]["value"]));
+			FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(na, SQLAssign(qres[i]["name"]), Params));
 		}
 	}
 
@@ -216,16 +202,9 @@ static void LoadDatabase()
 				continue;
 			}
 
-			try
-			{
-				EventReturn MOD_RESULT;
-				std::vector<std::string> Params = MakeVector(SQLAssign(qres[i]["value"]));
-				FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(bi, SQLAssign(qres[i]["name"]), Params));
-			}
-			catch (const char *err)
-			{
-				Alog() << "[db_mysql_read]: " << err;
-			}
+			EventReturn MOD_RESULT;
+			std::vector<std::string> Params = MakeVector(SQLAssign(qres[i]["value"]));
+			FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(bi, SQLAssign(qres[i]["name"]), Params));
 		}
 	}
 
@@ -504,16 +483,10 @@ static void LoadDatabase()
 				Alog() << "MySQL: Channel metadata for nonexistant channel " << qres[i]["channel"];
 				continue;
 			}
-			try
-			{
-				EventReturn MOD_RESULT;
-				std::vector<std::string> Params = MakeVector(SQLAssign(qres[i]["value"]));
-				FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(ci, SQLAssign(qres[i]["name"]), Params));
-			}
-			catch (const char *err)
-			{
-				Alog() << "[db_mysql_read]: " << err;
-			}
+			
+			EventReturn MOD_RESULT;
+			std::vector<std::string> Params = MakeVector(SQLAssign(qres[i]["value"]));
+			FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(ci, SQLAssign(qres[i]["name"]), Params));
 		}
 	}
 
-- 
cgit