From 6ed5283bc06a62f38eb517e67b975832b603bf61 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Tue, 5 Feb 2008 19:44:27 +0000
Subject: Converted logging to use log4net. Changed LogBase to ConsoleBase,
which handles console I/O. This is mostly an in-place conversion, so lots of
refactoring can still be done.
---
OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
(limited to 'OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs')
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
index aa0526c..ed9929c 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
@@ -39,6 +39,8 @@ namespace OpenSim.Framework.Data.MSSQL
///
internal class MSSQLUserData : IUserData
{
+ private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
///
/// Database manager for MySQL
///
@@ -94,7 +96,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
- MainLog.Instance.Error(e.ToString());
+ m_log.Error(e.ToString());
return null;
}
}
@@ -103,22 +105,22 @@ namespace OpenSim.Framework.Data.MSSQL
public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms)
{
- MainLog.Instance.Verbose("FRIEND", "Stub AddNewUserFriend called");
+ m_log.Info("[FRIEND]: Stub AddNewUserFriend called");
}
public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
{
- MainLog.Instance.Verbose("FRIEND", "Stub RemoveUserFriend called");
+ m_log.Info("[FRIEND]: Stub RemoveUserFriend called");
}
public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms)
{
- MainLog.Instance.Verbose("FRIEND", "Stub UpdateUserFriendPerms called");
+ m_log.Info("[FRIEND]: Stub UpdateUserFriendPerms called");
}
public List GetUserFriendList(LLUUID friendlistowner)
{
- MainLog.Instance.Verbose("FRIEND", "Stub GetUserFriendList called");
+ m_log.Info("[FRIEND]: Stub GetUserFriendList called");
return new List();
}
@@ -126,7 +128,7 @@ namespace OpenSim.Framework.Data.MSSQL
public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid)
{
- MainLog.Instance.Verbose("USER", "Stub UpdateUserCUrrentRegion called");
+ m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
}
@@ -168,7 +170,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
- MainLog.Instance.Error(e.ToString());
+ m_log.Error(e.ToString());
return returnlist;
}
}
@@ -204,7 +206,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
- MainLog.Instance.Error(e.ToString());
+ m_log.Error(e.ToString());
return returnlist;
}
}
@@ -235,7 +237,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
- MainLog.Instance.Error(e.ToString());
+ m_log.Error(e.ToString());
return null;
}
}
@@ -290,7 +292,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
- MainLog.Instance.Error(e.ToString());
+ m_log.Error(e.ToString());
return null;
}
}
@@ -324,7 +326,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
- MainLog.Instance.Error(e.ToString());
+ m_log.Error(e.ToString());
}
}
@@ -426,7 +428,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
- MainLog.Instance.Error(e.ToString());
+ m_log.Error(e.ToString());
}
return false;
}
--
cgit v1.1