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

* Split RestService.cs into GetAssetStreamHandler.cs and PostAssetStreamHandler.cs - then killed off original (misnomed) file. 

* Really, who wrote this jurassic shit code all with totally wrong file names? Ah yeah, that'd be me. Sorry.
GenericGridServerConcept
lbsa71 2009-02-19 18:53:43 +00:00
parent d2617149ca
commit 00a5fb9484
2 changed files with 138 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
OpenSim/Grid/AssetServer/RestService.cs → OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs
View File

@ -1,155 +1,94 @@
/* 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.Framework;
* notice, this list of conditions and the following disclaimer in the using OpenSim.Framework.Servers;
* documentation and/or other materials provided with the distribution. using OpenSim.Framework.Statistics;
* * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products namespace OpenSim.Grid.AssetServer
* derived from this software without specific prior written permission. {
* public class GetAssetStreamHandler : BaseStreamHandler
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY {
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY // private OpenAsset_Main m_assetManager;
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES private IAssetDataPlugin m_assetProvider;
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND /// <summary>
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT /// Constructor.
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS /// </summary>
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /// <param name="assetManager"></param>
*/ /// <param name="assetProvider"></param>
public GetAssetStreamHandler(IAssetDataPlugin assetProvider)
using System; : base("GET", "/assets")
using System.IO; {
using System.Reflection; m_log.Info("[REST]: In Get Request");
using System.Text; // m_assetManager = assetManager;
using System.Xml; m_assetProvider = assetProvider;
using System.Xml.Serialization; }
using log4net;
using OpenMetaverse; 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;
}
}
}

44
OpenSim/Grid/AssetServer/PostAssetStreamHandler.cs Normal file
View File

@ -0,0 +1,44 @@
using System.IO;
using System.Reflection;
using System.Xml.Serialization;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
namespace OpenSim.Grid.AssetServer
{
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;
}
}
}