From 5277fc64c07da92014e749be40aa837193a26495 Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Mon, 16 Feb 2009 02:27:43 +0000 Subject: - change AssetInventoryServer config from XML to INI - convert AssetInventoryServer logging to OpenSim's log4net - updated AssetInventoryServer.ini.example file --- .../Plugins/Simple/SimpleAssetStoragePlugin.cs | 19 ++++++++++-------- .../Plugins/Simple/SimpleInventoryStoragePlugin.cs | 23 ++++++++++++---------- 2 files changed, 24 insertions(+), 18 deletions(-) (limited to 'OpenSim/Grid/AssetInventoryServer/Plugins/Simple') diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs index 5a718f2..d66fc69 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs @@ -28,12 +28,14 @@ */ using System; +using System.Reflection; using System.Collections.Generic; using System.Net; using System.IO; using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Framework; +using log4net; namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple { @@ -43,6 +45,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple const string DEFAULT_DATA_DIR = "SimpleAssets"; const string TEMP_DATA_DIR = "SimpleAssetsTemp"; + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); AssetInventoryServer server; Dictionary metadataStorage; Dictionary filenames; @@ -82,7 +85,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple } catch (Exception ex) { - Logger.Log.ErrorFormat("Failed reading data for asset {0} from {1}: {2}", assetID, filename, ex.Message); + m_log.ErrorFormat("Failed reading data for asset {0} from {1}: {2}", assetID, filename, ex.Message); ret = BackendResponse.Failure; } } @@ -112,7 +115,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple } catch (Exception ex) { - Logger.Log.ErrorFormat("Failed reading data for asset {0} from {1}: {2}", assetID, filename, ex.Message); + m_log.ErrorFormat("Failed reading data for asset {0} from {1}: {2}", assetID, filename, ex.Message); ret = BackendResponse.Failure; } } @@ -169,7 +172,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple } catch (Exception ex) { - Logger.Log.ErrorFormat("Failed writing data for asset {0} to {1}: {2}", metadata.ID, filename, ex.Message); + m_log.ErrorFormat("Failed writing data for asset {0} to {1}: {2}", metadata.ID, filename, ex.Message); ret = BackendResponse.Failure; } @@ -207,7 +210,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple LoadFiles(DEFAULT_DATA_DIR, false); LoadFiles(TEMP_DATA_DIR, true); - Logger.Log.InfoFormat("Initialized the store index with metadata for {0} assets", + m_log.InfoFormat("Initialized the store index with metadata for {0} assets", metadataStorage.Count); } @@ -216,7 +219,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple /// public void Initialise() { - Logger.Log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); + m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); throw new PluginNotInitialisedException(Name); } @@ -243,7 +246,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple if (Directory.Exists(TEMP_DATA_DIR)) { try { Directory.Delete(TEMP_DATA_DIR); } - catch (Exception ex) { Logger.Log.Error(ex.Message); } + catch (Exception ex) { m_log.Error(ex.Message); } } } @@ -255,7 +258,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple try { Directory.CreateDirectory(folder); } catch (Exception ex) { - Logger.Log.Warn(ex.Message); + m_log.Warn(ex.Message); return; } } @@ -287,7 +290,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple } catch (Exception ex) { - Logger.Log.Warn(ex.Message); + m_log.Warn(ex.Message); } } } diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs index 415874a..8be6f8c 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs @@ -28,6 +28,7 @@ */ using System; +using System.Reflection; using System.Collections.Generic; using System.Net; using System.IO; @@ -35,6 +36,7 @@ using System.Text; using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Framework; +using log4net; namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple { @@ -43,6 +45,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple const string EXTENSION_NAME = "SimpleInventoryStorage"; // Used for metrics reporting const string DEFAULT_INVENTORY_DIR = "SimpleInventory"; + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); AssetInventoryServer server; Dictionary inventories = new Dictionary(); Dictionary> activeGestures = new Dictionary>(); @@ -209,7 +212,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple } catch (Exception ex) { - Logger.Log.Error(ex.Message); + m_log.Error(ex.Message); ret = BackendResponse.Failure; } } @@ -251,7 +254,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple } catch (Exception ex) { - Logger.Log.Error(ex.Message); + m_log.Error(ex.Message); ret = BackendResponse.Failure; } } @@ -305,7 +308,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple } catch (Exception ex) { - Logger.Log.Error(ex.Message); + m_log.Error(ex.Message); ret = BackendResponse.Failure; } } @@ -353,7 +356,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple foreach (string match in matches) { try { File.Delete(match); } - catch (Exception ex) { Logger.Log.ErrorFormat("Failed to delete file {0}: {1}", match, ex.Message); } + catch (Exception ex) { m_log.ErrorFormat("Failed to delete file {0}: {1}", match, ex.Message); } } ret = BackendResponse.Success; @@ -390,7 +393,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple foreach (string match in matches) { try { File.Delete(match); } - catch (Exception ex) { Logger.Log.ErrorFormat("Failed to delete folder file {0}: {1}", match, ex.Message); } + catch (Exception ex) { m_log.ErrorFormat("Failed to delete folder file {0}: {1}", match, ex.Message); } } ret = BackendResponse.Success; @@ -501,7 +504,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple try { Directory.CreateDirectory(folder); } catch (Exception ex) { - Logger.Log.Warn(ex.Message); + m_log.Warn(ex.Message); return; } } @@ -525,7 +528,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple } catch (Exception ex) { - Logger.Log.WarnFormat("Failed loading the index file {0}: {1}", indexPath, ex.Message); + m_log.WarnFormat("Failed loading the index file {0}: {1}", indexPath, ex.Message); } if (ownerID != UUID.Zero && owner != null) @@ -581,7 +584,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple } catch (Exception ex) { - Logger.Log.ErrorFormat("Failed loading inventory from {0}: {1}", folder, ex.Message); + m_log.ErrorFormat("Failed loading inventory from {0}: {1}", folder, ex.Message); } } @@ -593,7 +596,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple LoadFiles(DEFAULT_INVENTORY_DIR); - Logger.Log.InfoFormat("Initialized the inventory index with data for {0} avatars", + m_log.InfoFormat("Initialized the inventory index with data for {0} avatars", inventories.Count); } @@ -602,7 +605,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple /// public void Initialise() { - Logger.Log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); + m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); throw new PluginNotInitialisedException(Name); } -- cgit v1.1