diff options
author | Mike Mazur | 2009-02-16 02:27:43 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-16 02:27:43 +0000 |
commit | 5277fc64c07da92014e749be40aa837193a26495 (patch) | |
tree | 5351a96ac5d612560dc63d8c8585237d9dc80d27 /OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs | |
parent | - remove dependency on ExtensionLoader.dll (DBConnString.cs can go) (diff) | |
download | opensim-SC-5277fc64c07da92014e749be40aa837193a26495.zip opensim-SC-5277fc64c07da92014e749be40aa837193a26495.tar.gz opensim-SC-5277fc64c07da92014e749be40aa837193a26495.tar.bz2 opensim-SC-5277fc64c07da92014e749be40aa837193a26495.tar.xz |
- change AssetInventoryServer config from XML to INI
- convert AssetInventoryServer logging to OpenSim's log4net
- updated AssetInventoryServer.ini.example file
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs')
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs index d1ea201..ffeca1a 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | using System; | 30 | using System; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Reflection; | ||
32 | using System.Collections.Generic; | 33 | using System.Collections.Generic; |
33 | using System.Net; | 34 | using System.Net; |
34 | using System.Xml; | 35 | using System.Xml; |
@@ -37,11 +38,13 @@ using OpenMetaverse.StructuredData; | |||
37 | using HttpServer; | 38 | using HttpServer; |
38 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
41 | using log4net; | ||
40 | 42 | ||
41 | namespace OpenSim.Grid.AssetInventoryServer.Plugins | 43 | namespace OpenSim.Grid.AssetInventoryServer.Plugins |
42 | { | 44 | { |
43 | public class ReferenceFrontendPlugin : IAssetInventoryServerPlugin | 45 | public class ReferenceFrontendPlugin : IAssetInventoryServerPlugin |
44 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | AssetInventoryServer m_server; | 48 | AssetInventoryServer m_server; |
46 | 49 | ||
47 | public ReferenceFrontendPlugin() | 50 | public ReferenceFrontendPlugin() |
@@ -63,7 +66,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
63 | // Asset creation | 66 | // Asset creation |
64 | m_server.HttpServer.AddStreamHandler(new CreateRequestHandler(server)); | 67 | m_server.HttpServer.AddStreamHandler(new CreateRequestHandler(server)); |
65 | 68 | ||
66 | Logger.Log.Info("[ASSET] Reference Frontend loaded."); | 69 | m_log.Info("[ASSET] Reference Frontend loaded."); |
67 | } | 70 | } |
68 | 71 | ||
69 | /// <summary> | 72 | /// <summary> |
@@ -71,7 +74,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
71 | /// </summary> | 74 | /// </summary> |
72 | public void Initialise() | 75 | public void Initialise() |
73 | { | 76 | { |
74 | Logger.Log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); | 77 | m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); |
75 | throw new PluginNotInitialisedException(Name); | 78 | throw new PluginNotInitialisedException(Name); |
76 | } | 79 | } |
77 | 80 | ||
@@ -159,7 +162,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
159 | } | 162 | } |
160 | else if (storageResponse == BackendResponse.NotFound) | 163 | else if (storageResponse == BackendResponse.NotFound) |
161 | { | 164 | { |
162 | Logger.Log.Warn("Could not find metadata for asset " + assetID.ToString()); | 165 | m_log.Warn("Could not find metadata for asset " + assetID.ToString()); |
163 | httpResponse.StatusCode = (int) HttpStatusCode.NotFound; | 166 | httpResponse.StatusCode = (int) HttpStatusCode.NotFound; |
164 | } | 167 | } |
165 | else | 168 | else |