From 7f11079f57faacedc2dc8e3f2005b483e7314726 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Fri, 28 Mar 2008 21:43:46 +0000 Subject: * Refactored out common http handler operations --- OpenSim/Grid/AssetServer/Main.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'OpenSim/Grid/AssetServer/Main.cs') diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index d2c247a..c863c76 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs @@ -51,7 +51,7 @@ namespace OpenSim.Grid.AssetServer // 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) @@ -94,14 +94,19 @@ namespace OpenSim.Grid.AssetServer LoadDefaultAssets(); m_log.Info("[ASSET]: Starting HTTP process"); - BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort); - + m_httpServer = new BaseHttpServer(m_config.HttpPort); + StatsManager.StartCollectingAssetStats(); - httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider)); - httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); + AddHttpHandlers(); - httpServer.Start(); + m_httpServer.Start(); + } + + protected void AddHttpHandlers() + { + m_httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider)); + m_httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); } public byte[] GetAssetData(LLUUID assetID, bool isTexture) -- cgit v1.1