OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Another stab at removing AssetServer.exe dependencies

GenericGridServerConcept
lbsa71 2009-02-20 02:26:27 +00:00
parent e725e485fa
commit 5e39e515f9
4 changed files with 141 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

251
OpenSim/Grid/AssetServer/RestService.cs → OpenSim/Framework/Servers/GetAssetStreamHandler.cs
View File

@ -1,156 +1,95 @@
/* using System;
* Copyright (c) Contributors, http://opensimulator.org/ using System.IO;
* See CONTRIBUTORS.TXT for a full list of copyright holders. using System.Reflection;
* using System.Text;
* Redistribution and use in source and binary forms, with or without using System.Xml;
* modification, are permitted provided that the following conditions are met: using System.Xml.Serialization;
* * Redistributions of source code must retain the above copyright using log4net;
* notice, this list of conditions and the following disclaimer. using OpenMetaverse;
* * Redistributions in binary form must reproduce the above copyright using OpenSim.Data;
* notice, this list of conditions and the following disclaimer in the using OpenSim.Framework;
* documentation and/or other materials provided with the distribution. using OpenSim.Framework.Servers;
* * Neither the name of the OpenSim Project nor the using OpenSim.Framework.Statistics;
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. namespace OpenSim.Framework.Servers
* {
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY public class GetAssetStreamHandler : BaseStreamHandler
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED {
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES // private OpenAsset_Main m_assetManager;
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; private IAssetDataPlugin m_assetProvider;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT /// <summary>
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS /// Constructor.
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /// </summary>
*/ /// <param name="assetManager"></param>
/// <param name="assetProvider"></param>
using System; public GetAssetStreamHandler(IAssetDataPlugin assetProvider)
using System.IO; : base("GET", "/assets")
using System.Reflection; {
using System.Text; m_log.Info("[REST]: In Get Request");
using System.Xml; // m_assetManager = assetManager;
using System.Xml.Serialization; m_assetProvider = assetProvider;
using log4net; }
using OpenMetaverse;
using OpenSim.Data; public override byte[] Handle(string path, Stream request,
using OpenSim.Framework; OSHttpRequest httpRequest, OSHttpResponse httpResponse)
using OpenSim.Framework.Servers; {
using OpenSim.Framework.Statistics; string param = GetParam(path);
byte[] result = new byte[] {};
namespace OpenSim.Grid.AssetServer
{ string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);
public class GetAssetStreamHandler : BaseStreamHandler
{ if (p.Length > 0)
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); {
UUID assetID = UUID.Zero;
// private OpenAsset_Main m_assetManager;
private IAssetDataPlugin m_assetProvider; if (!UUID.TryParse(p[0], out assetID))
{
/// <summary> m_log.InfoFormat(
/// Constructor. "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
/// </summary> return result;
/// <param name="assetManager"></param> }
/// <param name="assetProvider"></param>
public GetAssetStreamHandler(IAssetDataPlugin assetProvider) if (StatsManager.AssetStats != null)
: base("GET", "/assets") StatsManager.AssetStats.AddRequest();
{
m_log.Info("[REST]: In Get Request"); AssetBase asset = m_assetProvider.FetchAsset(assetID);
// m_assetManager = assetManager; if (asset != null)
m_assetProvider = assetProvider; {
} XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
MemoryStream ms = new MemoryStream();
public override byte[] Handle(string path, Stream request, XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
OSHttpRequest httpRequest, OSHttpResponse httpResponse) xw.Formatting = Formatting.Indented;
{ xs.Serialize(xw, asset);
string param = GetParam(path); xw.Flush();
byte[] result = new byte[] {};
ms.Seek(0, SeekOrigin.Begin);
string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries); //StreamReader sr = new StreamReader(ms);
if (p.Length > 0) result = ms.GetBuffer();
{
UUID assetID = UUID.Zero; //Ckrinke 1/11/09 Commenting out the succesful REST message as under heavy use there
//are multiple messages in a second and that is usually (in my experience) meaning
if (!UUID.TryParse(p[0], out assetID)) //the logging itself is slowing down the program. Leaving the unsuccesful message
{ //as we need to know about that path.
m_log.InfoFormat( // m_log.InfoFormat(
"[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); // "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
return result; // assetID, asset.Name, result.Length);
}
Array.Resize<byte>(ref result, (int) ms.Length);
if (StatsManager.AssetStats != null) }
StatsManager.AssetStats.AddRequest(); else
{
AssetBase asset = m_assetProvider.FetchAsset(assetID); if (StatsManager.AssetStats != null)
if (asset != null) StatsManager.AssetStats.AddNotFoundRequest();
{
XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
MemoryStream ms = new MemoryStream(); }
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8); }
xw.Formatting = Formatting.Indented;
xs.Serialize(xw, asset); return result;
xw.Flush(); }
}
ms.Seek(0, SeekOrigin.Begin); }
//StreamReader sr = new StreamReader(ms);
result = ms.GetBuffer();
//Ckrinke 1/11/09 Commenting out the succesful REST message as under heavy use there
//are multiple messages in a second and that is usually (in my experience) meaning
//the logging itself is slowing down the program. Leaving the unsuccesful message
//as we need to know about that path.
// m_log.InfoFormat(
// "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
// assetID, asset.Name, result.Length);
Array.Resize<byte>(ref result, (int) ms.Length);
}
else
{
if (StatsManager.AssetStats != null)
StatsManager.AssetStats.AddNotFoundRequest();
m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
}
}
return result;
}
}
public class PostAssetStreamHandler : BaseStreamHandler
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private OpenAsset_Main m_assetManager;
private IAssetDataPlugin m_assetProvider;
public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{
string param = GetParam(path);
UUID assetId;
if (param.Length > 0)
UUID.TryParse(param, out assetId);
// byte[] txBuffer = new byte[4096];
XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
AssetBase asset = (AssetBase) xs.Deserialize(request);
m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID);
m_assetProvider.CreateAsset(asset);
return new byte[] {};
}
public PostAssetStreamHandler(IAssetDataPlugin assetProvider)
: base("POST", "/assets")
{
// m_assetManager = assetManager;
m_assetProvider = assetProvider;
}
}
}

45
OpenSim/Framework/Servers/PostAssetStreamHandler.cs Normal file
View File

@ -0,0 +1,45 @@
using System.IO;
using System.Reflection;
using System.Xml.Serialization;
using log4net;
using OpenMetaverse;
using OpenSim.Data;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
namespace OpenSim.Framework.Servers
{
public class PostAssetStreamHandler : BaseStreamHandler
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private OpenAsset_Main m_assetManager;
private IAssetDataPlugin m_assetProvider;
public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{
string param = GetParam(path);
UUID assetId;
if (param.Length > 0)
UUID.TryParse(param, out assetId);
// byte[] txBuffer = new byte[4096];
XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
AssetBase asset = (AssetBase) xs.Deserialize(request);
m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID);
m_assetProvider.CreateAsset(asset);
return new byte[] {};
}
public PostAssetStreamHandler(IAssetDataPlugin assetProvider)
: base("POST", "/assets")
{
// m_assetManager = assetManager;
m_assetProvider = assetProvider;
}
}
}

1
OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
View File

@ -35,7 +35,6 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Grid.AssetServer;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;

5
prebuild.xml
View File

@ -300,6 +300,7 @@
<ReferencePath>../../../bin/</ReferencePath> <ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/> <Reference name="System"/>
<Reference name="System.Xml"/> <Reference name="System.Xml"/>
<Reference name="OpenSim.Data"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Statistics"/> <Reference name="OpenSim.Framework.Statistics"/>
@ -572,7 +573,6 @@
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Statistics"/> <Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Physics.Manager"/> <Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Grid.AssetServer"/>
<!-- For scripting in funny languages by default --> <!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/> <Reference name="Microsoft.JScript"/>
@ -986,7 +986,6 @@
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Statistics"/> <Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Physics.Manager"/> <Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Grid.AssetServer"/>
<!-- For scripting in funny languages by default --> <!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/> <Reference name="Microsoft.JScript"/>
@ -1060,7 +1059,6 @@
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Statistics"/> <Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Physics.Manager"/> <Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Grid.AssetServer"/>
<!-- For scripting in funny languages by default --> <!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/> <Reference name="Microsoft.JScript"/>
@ -2338,7 +2336,6 @@
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Statistics"/> <Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Physics.Manager"/> <Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Grid.AssetServer"/>
<Reference name="Mono.Data.SqliteClient"/> <Reference name="Mono.Data.SqliteClient"/>
<!-- For scripting in funny languages by default --> <!-- For scripting in funny languages by default -->