* Rex Merges, Grid/AssetServer
parent
2e30c9cdc0
commit
f55bba8019
|
@ -1,189 +1,195 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.AssetLoader.Filesystem;
|
using OpenSim.Framework.AssetLoader.Filesystem;
|
||||||
using OpenSim.Framework.Console;
|
using OpenSim.Framework.Console;
|
||||||
using OpenSim.Framework.Servers;
|
using OpenSim.Framework.Servers;
|
||||||
|
using OpenSim.Framework.Statistics;
|
||||||
namespace OpenSim.Grid.AssetServer
|
|
||||||
{
|
namespace OpenSim.Grid.AssetServer
|
||||||
/// <summary>
|
{
|
||||||
/// An asset server
|
/// <summary>
|
||||||
/// </summary>
|
/// An asset server
|
||||||
public class OpenAsset_Main : conscmd_callback
|
/// </summary>
|
||||||
{
|
public class OpenAsset_Main : BaseOpenSimServer, conscmd_callback
|
||||||
public AssetConfig m_config;
|
{
|
||||||
|
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
public static OpenAsset_Main assetserver;
|
|
||||||
|
public AssetConfig m_config;
|
||||||
private LogBase m_console;
|
|
||||||
|
public static OpenAsset_Main assetserver;
|
||||||
// Temporarily hardcoded - should be a plugin
|
|
||||||
protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
|
// Temporarily hardcoded - should be a plugin
|
||||||
|
protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
|
||||||
private IAssetProvider m_assetProvider;
|
|
||||||
|
private IAssetProvider m_assetProvider;
|
||||||
[STAThread]
|
|
||||||
public static void Main(string[] args)
|
[STAThread]
|
||||||
{
|
public static void Main(string[] args)
|
||||||
Console.WriteLine("Starting...\n");
|
{
|
||||||
|
log4net.Config.XmlConfigurator.Configure();
|
||||||
assetserver = new OpenAsset_Main();
|
|
||||||
assetserver.Startup();
|
m_log.Info("Starting...\n");
|
||||||
|
|
||||||
assetserver.Work();
|
assetserver = new OpenAsset_Main();
|
||||||
}
|
assetserver.Startup();
|
||||||
|
|
||||||
private void Work()
|
assetserver.Work();
|
||||||
{
|
}
|
||||||
m_console.Notice("Enter help for a list of commands");
|
|
||||||
|
private void Work()
|
||||||
while (true)
|
{
|
||||||
{
|
m_console.Notice("Enter help for a list of commands");
|
||||||
m_console.MainLogPrompt();
|
|
||||||
}
|
while (true)
|
||||||
}
|
{
|
||||||
|
m_console.Prompt();
|
||||||
private OpenAsset_Main()
|
}
|
||||||
{
|
}
|
||||||
if (!Directory.Exists(Util.logDir()))
|
|
||||||
{
|
private OpenAsset_Main()
|
||||||
Directory.CreateDirectory(Util.logDir());
|
{
|
||||||
}
|
m_console = new ConsoleBase("OpenAsset", this);
|
||||||
m_console =
|
|
||||||
new LogBase((Path.Combine(Util.logDir(), "opengrid-AssetServer-console.log")), "OpenAsset", this, true);
|
MainConsole.Instance = m_console;
|
||||||
MainLog.Instance = m_console;
|
}
|
||||||
}
|
|
||||||
|
public void Startup()
|
||||||
public void Startup()
|
{
|
||||||
{
|
m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
|
||||||
m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
|
|
||||||
|
m_log.Info("[ASSET]: Setting up asset DB");
|
||||||
m_console.Verbose("ASSET", "Setting up asset DB");
|
setupDB(m_config);
|
||||||
setupDB(m_config);
|
|
||||||
|
m_log.Info("[ASSET]: Loading default asset set..");
|
||||||
m_console.Verbose("ASSET", "Loading default asset set..");
|
LoadDefaultAssets();
|
||||||
LoadDefaultAssets();
|
|
||||||
|
m_log.Info("[ASSET]: Starting HTTP process");
|
||||||
m_console.Verbose("ASSET", "Starting HTTP process");
|
BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort);
|
||||||
BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort);
|
|
||||||
|
StatsManager.StartCollectingAssetStats();
|
||||||
httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider));
|
|
||||||
httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider));
|
httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider));
|
||||||
|
httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider));
|
||||||
httpServer.Start();
|
|
||||||
}
|
httpServer.Start();
|
||||||
|
}
|
||||||
public byte[] GetAssetData(LLUUID assetID, bool isTexture)
|
|
||||||
{
|
public byte[] GetAssetData(LLUUID assetID, bool isTexture)
|
||||||
return null;
|
{
|
||||||
}
|
return null;
|
||||||
|
}
|
||||||
public IAssetProvider LoadDatabasePlugin(string FileName)
|
|
||||||
{
|
public IAssetProvider LoadDatabasePlugin(string FileName)
|
||||||
MainLog.Instance.Verbose("ASSET SERVER", "LoadDatabasePlugin: Attempting to load " + FileName);
|
{
|
||||||
Assembly pluginAssembly = Assembly.LoadFrom(FileName);
|
m_log.Info("[ASSET SERVER]: LoadDatabasePlugin: Attempting to load " + FileName);
|
||||||
IAssetProvider assetPlugin = null;
|
Assembly pluginAssembly = Assembly.LoadFrom(FileName);
|
||||||
foreach (Type pluginType in pluginAssembly.GetTypes())
|
IAssetProvider assetPlugin = null;
|
||||||
{
|
foreach (Type pluginType in pluginAssembly.GetTypes())
|
||||||
if (!pluginType.IsAbstract)
|
{
|
||||||
{
|
if (!pluginType.IsAbstract)
|
||||||
Type typeInterface = pluginType.GetInterface("IAssetProvider", true);
|
{
|
||||||
|
Type typeInterface = pluginType.GetInterface("IAssetProvider", true);
|
||||||
if (typeInterface != null)
|
|
||||||
{
|
if (typeInterface != null)
|
||||||
IAssetProvider plug =
|
{
|
||||||
(IAssetProvider) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
|
IAssetProvider plug =
|
||||||
assetPlugin = plug;
|
(IAssetProvider) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
|
||||||
assetPlugin.Initialise();
|
assetPlugin = plug;
|
||||||
|
assetPlugin.Initialise();
|
||||||
MainLog.Instance.Verbose("ASSET SERVER", "Added " + assetPlugin.Name + " " + assetPlugin.Version);
|
|
||||||
break;
|
m_log.Info("[ASSET SERVER]: Added " + assetPlugin.Name + " " + assetPlugin.Version);
|
||||||
}
|
break;
|
||||||
|
}
|
||||||
typeInterface = null;
|
|
||||||
}
|
typeInterface = null;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
pluginAssembly = null;
|
|
||||||
return assetPlugin;
|
pluginAssembly = null;
|
||||||
}
|
return assetPlugin;
|
||||||
|
}
|
||||||
public void setupDB(AssetConfig config)
|
|
||||||
{
|
public void setupDB(AssetConfig config)
|
||||||
try
|
{
|
||||||
{
|
try
|
||||||
m_assetProvider = LoadDatabasePlugin(config.DatabaseProvider);
|
{
|
||||||
if (m_assetProvider == null)
|
m_assetProvider = LoadDatabasePlugin(config.DatabaseProvider);
|
||||||
{
|
if (m_assetProvider == null)
|
||||||
MainLog.Instance.Error("ASSET", "Failed to load a database plugin, server halting");
|
{
|
||||||
Environment.Exit(-1);
|
m_log.Error("[ASSET]: Failed to load a database plugin, server halting");
|
||||||
}
|
Environment.Exit(-1);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
}
|
||||||
{
|
catch (Exception e)
|
||||||
MainLog.Instance.Warn("ASSET", "setupDB() - Exception occured");
|
{
|
||||||
MainLog.Instance.Warn("ASSET", e.ToString());
|
m_log.Warn("[ASSET]: setupDB() - Exception occured");
|
||||||
}
|
m_log.Warn("[ASSET]: " + e.ToString());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public void LoadDefaultAssets()
|
|
||||||
{
|
public void LoadDefaultAssets()
|
||||||
assetLoader.ForEachDefaultXmlAsset(StoreAsset);
|
{
|
||||||
}
|
assetLoader.ForEachDefaultXmlAsset(StoreAsset);
|
||||||
|
}
|
||||||
protected void StoreAsset(AssetBase asset)
|
|
||||||
{
|
protected void StoreAsset(AssetBase asset)
|
||||||
m_assetProvider.CreateAsset(asset);
|
{
|
||||||
}
|
m_assetProvider.CreateAsset(asset);
|
||||||
|
}
|
||||||
public void RunCmd(string cmd, string[] cmdparams)
|
|
||||||
{
|
public override void RunCmd(string cmd, string[] cmdparams)
|
||||||
switch (cmd)
|
{
|
||||||
{
|
base.RunCmd(cmd, cmdparams);
|
||||||
case "help":
|
|
||||||
m_console.Notice("shutdown - shutdown this asset server (USE CAUTION!)");
|
switch (cmd)
|
||||||
break;
|
{
|
||||||
|
case "help":
|
||||||
case "shutdown":
|
m_console.Notice(
|
||||||
m_console.Close();
|
@"shutdown - shutdown this asset server (USE CAUTION!)
|
||||||
Environment.Exit(0);
|
stats - statistical information for this server");
|
||||||
break;
|
|
||||||
}
|
break;
|
||||||
}
|
|
||||||
|
case "stats":
|
||||||
public void Show(string ShowWhat)
|
m_console.Notice("STATS", Environment.NewLine + StatsManager.AssetStats.Report());
|
||||||
{
|
break;
|
||||||
}
|
|
||||||
}
|
case "shutdown":
|
||||||
}
|
m_console.Close();
|
||||||
|
Environment.Exit(0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,63 +1,63 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// General Information about an assembly is controlled through the following
|
// General Information about an assembly is controlled through the following
|
||||||
// set of attributes. Change these attribute values to modify the information
|
// set of attributes. Change these attribute values to modify the information
|
||||||
// associated with an assembly.
|
// associated with an assembly.
|
||||||
|
|
||||||
[assembly : AssemblyTitle("OGS-AssetServer")]
|
[assembly : AssemblyTitle("OGS-AssetServer")]
|
||||||
[assembly : AssemblyDescription("")]
|
[assembly : AssemblyDescription("")]
|
||||||
[assembly : AssemblyConfiguration("")]
|
[assembly : AssemblyConfiguration("")]
|
||||||
[assembly : AssemblyCompany("")]
|
[assembly : AssemblyCompany("")]
|
||||||
[assembly : AssemblyProduct("OGS-AssetServer")]
|
[assembly : AssemblyProduct("OGS-AssetServer")]
|
||||||
[assembly : AssemblyCopyright("Copyright © 2007")]
|
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
|
||||||
[assembly : AssemblyTrademark("")]
|
[assembly : AssemblyTrademark("")]
|
||||||
[assembly : AssemblyCulture("")]
|
[assembly : AssemblyCulture("")]
|
||||||
|
|
||||||
// Setting ComVisible to false makes the types in this assembly not visible
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
// to COM components. If you need to access a type in this assembly from
|
// to COM components. If you need to access a type in this assembly from
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
|
||||||
[assembly : ComVisible(false)]
|
[assembly : ComVisible(false)]
|
||||||
|
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
|
||||||
[assembly : Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
|
[assembly : Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
|
||||||
|
|
||||||
// Version information for an assembly consists of the following four values:
|
// Version information for an assembly consists of the following four values:
|
||||||
//
|
//
|
||||||
// Major Version
|
// Major Version
|
||||||
// Minor Version
|
// Minor Version
|
||||||
// Build Number
|
// Build Number
|
||||||
// Revision
|
// Revision
|
||||||
//
|
//
|
||||||
|
|
||||||
[assembly : AssemblyVersion("1.0.0.0")]
|
[assembly : AssemblyVersion("1.0.0.0")]
|
||||||
[assembly : AssemblyFileVersion("1.0.0.0")]
|
[assembly : AssemblyFileVersion("1.0.0.0")]
|
||||||
|
|
|
@ -1,132 +1,155 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
using System.Xml.Serialization;
|
using System.Xml.Serialization;
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Console;
|
using OpenSim.Framework.Console;
|
||||||
using OpenSim.Framework.Servers;
|
using OpenSim.Framework.Servers;
|
||||||
|
using OpenSim.Framework.Statistics;
|
||||||
namespace OpenSim.Grid.AssetServer
|
|
||||||
{
|
namespace OpenSim.Grid.AssetServer
|
||||||
public class GetAssetStreamHandler : BaseStreamHandler
|
{
|
||||||
{
|
public class GetAssetStreamHandler : BaseStreamHandler
|
||||||
private OpenAsset_Main m_assetManager;
|
{
|
||||||
private IAssetProvider m_assetProvider;
|
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
public override byte[] Handle(string path, Stream request)
|
private OpenAsset_Main m_assetManager;
|
||||||
{
|
private IAssetProvider m_assetProvider;
|
||||||
MainLog.Instance.Verbose("REST", "In Handle");
|
|
||||||
string param = GetParam(path);
|
/// <summary>
|
||||||
byte[] result = new byte[] {};
|
/// Constructor.
|
||||||
try
|
/// </summary>
|
||||||
{
|
/// <param name="assetManager"></param>
|
||||||
string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);
|
/// <param name="assetProvider"></param>
|
||||||
|
public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider)
|
||||||
if (p.Length > 0)
|
: base("GET", "/assets")
|
||||||
{
|
{
|
||||||
LLUUID assetID = LLUUID.Parse(p[0]);
|
m_log.Info("[REST]: In Get Request");
|
||||||
|
m_assetManager = assetManager;
|
||||||
MainLog.Instance.Verbose("REST", "GET:/asset fetch param={0} UUID={1}", param, assetID);
|
m_assetProvider = assetProvider;
|
||||||
AssetBase asset = m_assetProvider.FetchAsset(assetID);
|
}
|
||||||
if (asset != null)
|
|
||||||
{
|
public override byte[] Handle(string path, Stream request)
|
||||||
MainLog.Instance.Verbose("REST", "GET:/asset found {0}, {1}", assetID, asset.Name);
|
{
|
||||||
|
string param = GetParam(path);
|
||||||
XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
|
byte[] result = new byte[] {};
|
||||||
MemoryStream ms = new MemoryStream();
|
try
|
||||||
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
|
{
|
||||||
xw.Formatting = Formatting.Indented;
|
string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);
|
||||||
xs.Serialize(xw, asset);
|
|
||||||
xw.Flush();
|
if (p.Length > 0)
|
||||||
|
{
|
||||||
ms.Seek(0, SeekOrigin.Begin);
|
LLUUID assetID = null;
|
||||||
StreamReader sr = new StreamReader(ms);
|
|
||||||
|
if (!LLUUID.TryParse(p[0], out assetID))
|
||||||
result = ms.GetBuffer();
|
{
|
||||||
MainLog.Instance.Verbose("REST", "Buffer: {0}", result);
|
m_log.InfoFormat(
|
||||||
Array.Resize<byte>(ref result, (int) ms.Length);
|
"[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
|
||||||
}
|
return result;
|
||||||
else
|
}
|
||||||
{
|
|
||||||
MainLog.Instance.Verbose("REST", "GET:/asset failed to find {0}", assetID);
|
if (StatsManager.AssetStats != null)
|
||||||
}
|
StatsManager.AssetStats.AddRequest();
|
||||||
}
|
|
||||||
}
|
AssetBase asset = m_assetProvider.FetchAsset(assetID);
|
||||||
catch (Exception e)
|
if (asset != null)
|
||||||
{
|
{
|
||||||
MainLog.Instance.Error(e.ToString());
|
XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
|
||||||
}
|
MemoryStream ms = new MemoryStream();
|
||||||
return result;
|
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
|
||||||
}
|
xw.Formatting = Formatting.Indented;
|
||||||
|
xs.Serialize(xw, asset);
|
||||||
public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider)
|
xw.Flush();
|
||||||
: base("GET", "/assets")
|
|
||||||
{
|
ms.Seek(0, SeekOrigin.Begin);
|
||||||
MainLog.Instance.Verbose("REST", "In Get Request");
|
//StreamReader sr = new StreamReader(ms);
|
||||||
m_assetManager = assetManager;
|
|
||||||
m_assetProvider = assetProvider;
|
result = ms.GetBuffer();
|
||||||
}
|
|
||||||
}
|
m_log.InfoFormat(
|
||||||
|
"[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
|
||||||
public class PostAssetStreamHandler : BaseStreamHandler
|
assetID, asset.Name, result.Length);
|
||||||
{
|
|
||||||
private OpenAsset_Main m_assetManager;
|
Array.Resize<byte>(ref result, (int) ms.Length);
|
||||||
private IAssetProvider m_assetProvider;
|
}
|
||||||
|
else
|
||||||
public override byte[] Handle(string path, Stream request)
|
{
|
||||||
{
|
if (StatsManager.AssetStats != null)
|
||||||
string param = GetParam(path);
|
StatsManager.AssetStats.AddNotFoundRequest();
|
||||||
|
|
||||||
LLUUID assetId;
|
m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
|
||||||
if (param.Length > 0)
|
}
|
||||||
LLUUID.TryParse(param, out assetId);
|
}
|
||||||
byte[] txBuffer = new byte[4096];
|
}
|
||||||
|
catch (Exception e)
|
||||||
XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
|
{
|
||||||
AssetBase asset = (AssetBase) xs.Deserialize(request);
|
m_log.Error(e.ToString());
|
||||||
|
}
|
||||||
MainLog.Instance.Verbose("REST", "StoreAndCommitAsset {0}", asset.FullID);
|
return result;
|
||||||
m_assetProvider.CreateAsset(asset);
|
}
|
||||||
m_assetProvider.CommitAssets();
|
}
|
||||||
|
|
||||||
return new byte[] {};
|
public class PostAssetStreamHandler : BaseStreamHandler
|
||||||
}
|
{
|
||||||
|
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider)
|
|
||||||
: base("POST", "/assets")
|
private OpenAsset_Main m_assetManager;
|
||||||
{
|
private IAssetProvider m_assetProvider;
|
||||||
m_assetManager = assetManager;
|
|
||||||
m_assetProvider = assetProvider;
|
public override byte[] Handle(string path, Stream request)
|
||||||
}
|
{
|
||||||
}
|
string param = GetParam(path);
|
||||||
}
|
|
||||||
|
LLUUID assetId;
|
||||||
|
if (param.Length > 0)
|
||||||
|
LLUUID.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]: StoreAndCommitAsset {0}", asset.FullID);
|
||||||
|
m_assetProvider.CreateAsset(asset);
|
||||||
|
m_assetProvider.CommitAssets();
|
||||||
|
|
||||||
|
return new byte[] {};
|
||||||
|
}
|
||||||
|
|
||||||
|
public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider)
|
||||||
|
: base("POST", "/assets")
|
||||||
|
{
|
||||||
|
m_assetManager = assetManager;
|
||||||
|
m_assetProvider = assetProvider;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue