ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Converted logging to use log4net.

Browse Source 
Changed LogBase to ConsoleBase, which handles console I/O.
This is mostly an in-place conversion, so lots of refactoring can still be done.
This commit is contained in:
Jeff Ames
2008-02-05 19:44:27 +00:00
parent 7a61bcff86
commit 6ed5283bc0
173 changed files with 2175 additions and 1950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
View File

@@ -37,6 +37,8 @@ namespace OpenSim.Framework.Data.MSSQL
{
internal class MSSQLAssetData : IAssetProvider
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private MSSQLManager database;
#region IAssetProvider Members
@@ -46,7 +48,7 @@ namespace OpenSim.Framework.Data.MSSQL
// null as the version, indicates that the table didn't exist
if (tableName == null)
{
MainLog.Instance.Notice("ASSETS", "Creating new database tables");
m_log.Info("[ASSETS]: Creating new database tables");
database.ExecuteResourceSql("CreateAssetsTable.sql");
return;
}
@@ -164,7 +166,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
}

6
OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
View File

@@ -40,6 +40,8 @@ namespace OpenSim.Framework.Data.MSSQL
/// </summary>
public class SqlGridData : IGridData
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// Database manager
/// </summary>
@@ -172,7 +174,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
return returnlist;
}
}
@@ -208,7 +210,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
return returnlist;
}
}

34
OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs
View File

@@ -39,6 +39,8 @@ namespace OpenSim.Framework.Data.MSSQL
/// </summary>
public class MSSQLInventoryData : IInventoryData
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// The database manager
/// </summary>
@@ -159,7 +161,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
return null;
}
}
@@ -198,7 +200,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
return null;
}
}
@@ -244,7 +246,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
return null;
}
}
@@ -282,7 +284,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
return null;
}
}
@@ -315,7 +317,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (SqlException e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
return null;
@@ -352,7 +354,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
return null;
}
@@ -377,7 +379,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
return null;
@@ -412,7 +414,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (Exception e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
return null;
}
}
@@ -452,7 +454,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (SqlException e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
}
@@ -511,7 +513,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
}
@@ -533,7 +535,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (SqlException e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
}
@@ -564,7 +566,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
}
@@ -602,7 +604,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
}
@@ -628,7 +630,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
}
@@ -675,7 +677,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (SqlException e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
}
@@ -695,7 +697,7 @@ namespace OpenSim.Framework.Data.MSSQL
catch (SqlException e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
}

16
OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
View File

@@ -42,6 +42,8 @@ namespace OpenSim.Framework.Data.MSSQL
/// </summary>
internal class MSSQLManager
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// The database connection object
/// </summary>
@@ -92,7 +94,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception)
{
MainLog.Instance.Verbose("DATASTORE", "MSSQL Database doesn't exist... creating");
m_log.Info("[DATASTORE]: MSSQL Database doesn't exist... creating");
InitDB(conn);
}
cmd = Query("select top 1 webLoginKey from users", new Dictionary<string, string>());
@@ -260,7 +262,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error("Unable to reconnect to database " + e.ToString());
m_log.Error("Unable to reconnect to database " + e.ToString());
}
}
}
@@ -529,7 +531,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error("MSSQLManager : " + e.ToString());
m_log.Error("MSSQLManager : " + e.ToString());
}
return returnval;
@@ -573,7 +575,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
return false;
}
@@ -667,7 +669,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
return false;
}
@@ -688,7 +690,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error("Unable to execute query " + e.ToString());
m_log.Error("Unable to execute query " + e.ToString());
}
}
@@ -721,7 +723,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
m_log.Error(e.ToString());
}
}
tables.Close();

26
OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
View File

@@ -39,6 +39,8 @@ namespace OpenSim.Framework.Data.MSSQL
/// </summary>
internal class MSSQLUserData : IUserData
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// Database manager for MySQL
/// </summary>
@@ -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<FriendListItem> GetUserFriendList(LLUUID friendlistowner)
{
MainLog.Instance.Verbose("FRIEND", "Stub GetUserFriendList called");
m_log.Info("[FRIEND]: Stub GetUserFriendList called");
return new List<FriendListItem>();
}
@@ -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;
}