- change AssetInventoryServer config from XML to INI

- convert AssetInventoryServer logging to OpenSim's log4net
- updated AssetInventoryServer.ini.example file

1 files changed, 16 insertions, 12 deletions

diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
index caa4efd..39844f4 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
@@ -28,12 +28,15 @@
  */
 
 using System;
+using System.Reflection;
 using OpenMetaverse;
+using log4net;
 
 namespace OpenSim.Grid.AssetInventoryServer.Plugins
 {
     public class NullMetricsPlugin : IMetricsProvider
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         AssetInventoryServer server;
 
         public NullMetricsPlugin()
@@ -44,72 +47,72 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
 
         public void LogAssetMetadataFetch(string extension, BackendResponse response, UUID assetID, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] AssetMetadataFetch(): AssetID: {1}, Response: {2}", extension, assetID, response);
+            m_log.DebugFormat("[{0}] AssetMetadataFetch(): AssetID: {1}, Response: {2}", extension, assetID, response);
         }
 
         public void LogAssetDataFetch(string extension, BackendResponse response, UUID assetID, int dataSize, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] AssetDataFetch(): AssetID: {1}, DataSize: {2}, Response: {3}", extension, assetID,
+            m_log.DebugFormat("[{0}] AssetDataFetch(): AssetID: {1}, DataSize: {2}, Response: {3}", extension, assetID,
                 dataSize, response);
         }
 
         public void LogAssetCreate(string extension, BackendResponse response, UUID assetID, int dataSize, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] AssetCreate(): AssetID: {1}, DataSize: {2}, Response: {3}", extension, assetID,
+            m_log.DebugFormat("[{0}] AssetCreate(): AssetID: {1}, DataSize: {2}, Response: {3}", extension, assetID,
                 dataSize, response);
         }
 
         public void LogInventoryFetch(string extension, BackendResponse response, Uri owner, UUID objID, bool folder, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] InventoryFetch(): ObjID: {1}, Folder: {2}, OwnerID: {3}, Response: {4}", extension,
+            m_log.DebugFormat("[{0}] InventoryFetch(): ObjID: {1}, Folder: {2}, OwnerID: {3}, Response: {4}", extension,
                 objID, folder, owner, response);
         }
 
         public void LogInventoryFetchFolderContents(string extension, BackendResponse response, Uri owner, UUID folderID, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] InventoryFetchFolderContents(): FolderID: {1}, OwnerID: {2}, Response: {3}", extension,
+            m_log.DebugFormat("[{0}] InventoryFetchFolderContents(): FolderID: {1}, OwnerID: {2}, Response: {3}", extension,
                 folderID, owner, response);
         }
 
         public void LogInventoryFetchFolderList(string extension, BackendResponse response, Uri owner, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] InventoryFetchFolderList(): OwnerID: {1}, Response: {2}", extension,
+            m_log.DebugFormat("[{0}] InventoryFetchFolderList(): OwnerID: {1}, Response: {2}", extension,
                 owner, response);
         }
 
         public void LogInventoryFetchInventory(string extension, BackendResponse response, Uri owner, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] InventoryFetchInventory(): OwnerID: {1}, Response: {2}", extension,
+            m_log.DebugFormat("[{0}] InventoryFetchInventory(): OwnerID: {1}, Response: {2}", extension,
                 owner, response);
         }
 
         public void LogInventoryFetchActiveGestures(string extension, BackendResponse response, Uri owner, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] InventoryFetchActiveGestures(): OwnerID: {1}, Response: {2}", extension,
+            m_log.DebugFormat("[{0}] InventoryFetchActiveGestures(): OwnerID: {1}, Response: {2}", extension,
                 owner, response);
         }
 
         public void LogInventoryCreate(string extension, BackendResponse response, Uri owner, bool folder, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] InventoryCreate(): OwnerID: {1}, Response: {2}", extension,
+            m_log.DebugFormat("[{0}] InventoryCreate(): OwnerID: {1}, Response: {2}", extension,
                 owner, response);
         }
 
         public void LogInventoryCreateInventory(string extension, BackendResponse response, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] InventoryCreateInventory(): Response: {1}", extension,
+            m_log.DebugFormat("[{0}] InventoryCreateInventory(): Response: {1}", extension,
                 response);
         }
 
         public void LogInventoryDelete(string extension, BackendResponse response, Uri owner, UUID objID, bool folder, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] InventoryDelete(): OwnerID: {1}, Folder: {2}, Response: {3}", extension,
+            m_log.DebugFormat("[{0}] InventoryDelete(): OwnerID: {1}, Folder: {2}, Response: {3}", extension,
                 owner, folder, response);
         }
 
         public void LogInventoryPurgeFolder(string extension, BackendResponse response, Uri owner, UUID folderID, DateTime time)
         {
-            Logger.Log.DebugFormat("[{0}] InventoryPurgeFolder(): OwnerID: {1}, FolderID: {2}, Response: {3}", extension,
+            m_log.DebugFormat("[{0}] InventoryPurgeFolder(): OwnerID: {1}, FolderID: {2}, Response: {3}", extension,
                 owner, response);
         }
 
@@ -128,6 +131,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
         public void Initialise()
         {
             this.server = null;
+            m_log.Info("[ASSET] Null metrics loaded.");
         }
 
         public void Dispose()