mirror of
https://github.com/opensim/opensim.git
synced 2026-07-08 05:36:27 +08:00
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.
This commit is contained in:
@@ -38,6 +38,8 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
/// </summary>
|
||||
public class MySQLInventoryData : IInventoryData
|
||||
{
|
||||
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
/// <summary>
|
||||
/// The database manager
|
||||
/// </summary>
|
||||
@@ -104,8 +106,8 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
tableList["inventoryitems"] = null;
|
||||
|
||||
database.GetTableVersion(tableList);
|
||||
MainLog.Instance.Verbose("MYSQL", "Inventory Folder Version: " + tableList["inventoryfolders"]);
|
||||
MainLog.Instance.Verbose("MYSQL", "Inventory Items Version: " + tableList["inventoryitems"]);
|
||||
m_log.Info("[MYSQL]: Inventory Folder Version: " + tableList["inventoryfolders"]);
|
||||
m_log.Info("[MYSQL]: Inventory Items Version: " + tableList["inventoryitems"]);
|
||||
|
||||
UpgradeFoldersTable(tableList["inventoryfolders"]);
|
||||
UpgradeItemsTable(tableList["inventoryitems"]);
|
||||
@@ -170,7 +172,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
catch (Exception e)
|
||||
{
|
||||
database.Reconnect();
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -208,7 +210,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
catch (Exception e)
|
||||
{
|
||||
database.Reconnect();
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -254,7 +256,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
catch (Exception e)
|
||||
{
|
||||
database.Reconnect();
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -292,7 +294,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
catch (Exception e)
|
||||
{
|
||||
database.Reconnect();
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -325,7 +327,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -362,7 +364,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
catch (Exception e)
|
||||
{
|
||||
database.Reconnect();
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -387,7 +389,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -421,7 +423,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
catch (Exception e)
|
||||
{
|
||||
database.Reconnect();
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -459,7 +461,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
}
|
||||
catch (MySqlException e)
|
||||
{
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -488,7 +490,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
catch (MySqlException e)
|
||||
{
|
||||
database.Reconnect();
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -516,7 +518,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -548,7 +550,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -593,7 +595,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
catch (MySqlException e)
|
||||
{
|
||||
database.Reconnect();
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -609,7 +611,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||
catch (MySqlException e)
|
||||
{
|
||||
database.Reconnect();
|
||||
MainLog.Instance.Error(e.ToString());
|
||||
m_log.Error(e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user