diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLManager.cs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs index 3df0242..f70b505 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs | |||
@@ -42,6 +42,8 @@ namespace OpenSim.Framework.Data.MySQL | |||
42 | /// </summary> | 42 | /// </summary> |
43 | internal class MySQLManager | 43 | internal class MySQLManager |
44 | { | 44 | { |
45 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | |||
45 | /// <summary> | 47 | /// <summary> |
46 | /// The database connection object | 48 | /// The database connection object |
47 | /// </summary> | 49 | /// </summary> |
@@ -71,7 +73,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
71 | 73 | ||
72 | dbcon.Open(); | 74 | dbcon.Open(); |
73 | 75 | ||
74 | MainLog.Instance.Verbose("MYSQL", "Connection established"); | 76 | m_log.Info("[MYSQL]: Connection established"); |
75 | } | 77 | } |
76 | catch (Exception e) | 78 | catch (Exception e) |
77 | { | 79 | { |
@@ -113,7 +115,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
113 | } | 115 | } |
114 | catch (Exception e) | 116 | catch (Exception e) |
115 | { | 117 | { |
116 | MainLog.Instance.Error("Unable to reconnect to database " + e.ToString()); | 118 | m_log.Error("Unable to reconnect to database " + e.ToString()); |
117 | } | 119 | } |
118 | } | 120 | } |
119 | } | 121 | } |
@@ -194,7 +196,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
194 | } | 196 | } |
195 | catch (Exception e) | 197 | catch (Exception e) |
196 | { | 198 | { |
197 | MainLog.Instance.Error(e.ToString()); | 199 | m_log.Error(e.ToString()); |
198 | } | 200 | } |
199 | } | 201 | } |
200 | tables.Close(); | 202 | tables.Close(); |
@@ -245,7 +247,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
245 | } | 247 | } |
246 | catch (Exception e) | 248 | catch (Exception e) |
247 | { | 249 | { |
248 | MainLog.Instance.Error("Unable to reconnect to database " + e.ToString()); | 250 | m_log.Error("Unable to reconnect to database " + e.ToString()); |
249 | } | 251 | } |
250 | 252 | ||
251 | // Run the query again | 253 | // Run the query again |
@@ -263,7 +265,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
263 | catch (Exception e) | 265 | catch (Exception e) |
264 | { | 266 | { |
265 | // Return null if it fails. | 267 | // Return null if it fails. |
266 | MainLog.Instance.Error("Failed during Query generation: " + e.ToString()); | 268 | m_log.Error("Failed during Query generation: " + e.ToString()); |
267 | return null; | 269 | return null; |
268 | } | 270 | } |
269 | } | 271 | } |
@@ -523,7 +525,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
523 | } | 525 | } |
524 | catch (Exception e) | 526 | catch (Exception e) |
525 | { | 527 | { |
526 | MainLog.Instance.Error(e.ToString()); | 528 | m_log.Error(e.ToString()); |
527 | return false; | 529 | return false; |
528 | } | 530 | } |
529 | 531 | ||
@@ -617,7 +619,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
617 | } | 619 | } |
618 | catch (Exception e) | 620 | catch (Exception e) |
619 | { | 621 | { |
620 | MainLog.Instance.Error(e.ToString()); | 622 | m_log.Error(e.ToString()); |
621 | return false; | 623 | return false; |
622 | } | 624 | } |
623 | 625 | ||
@@ -726,7 +728,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
726 | } | 728 | } |
727 | catch (Exception e) | 729 | catch (Exception e) |
728 | { | 730 | { |
729 | MainLog.Instance.Error(e.ToString()); | 731 | m_log.Error(e.ToString()); |
730 | return false; | 732 | return false; |
731 | } | 733 | } |
732 | 734 | ||