Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Allow HttpServer AddHandler() and RemoveHandler() while the server is running

Browse Source 
* Simplified HttpServer calback exception handling
* Fixed a recently introduced typo in LLSD binary serialization
* Allow LLSD binary serialization to work with any Stream instead of only MemoryStream
* Improved Utils.HexStringToBytes(), changed function signature
* Added an efficient Utils.EnumTryParse<T>()

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2323 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2008-11-05 01:50:24 +00:00
parent f53aee6fa8
commit 61c8451fac
5 changed files with 89 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
OpenMetaverse/Capabilities/HttpServer.cs
View File

@@ -65,6 +65,7 @@ namespace OpenMetaverse.Capabilities
AsyncCallback serverCallback;
//int serverPort;
//bool sslEnabled;
// TODO: Replace this with an immutable list to avoid locking
List<HttpRequestHandler> requestHandlers;
bool isRunning;
@@ -97,18 +98,12 @@ namespace OpenMetaverse.Capabilities
public void AddHandler(HttpRequestHandler handler)
{
if (!isRunning)
requestHandlers.Add(handler);
else
throw new InvalidOperationException("Cannot add HTTP request handlers while the server is running");
lock (requestHandlers) requestHandlers.Add(handler);
}
public void RemoveHandler(HttpRequestHandler handler)
{
if (!isRunning)
requestHandlers.Remove(handler);
else
throw new InvalidOperationException("Cannot add HTTP request handlers while the server is running");
lock (requestHandlers) requestHandlers.Remove(handler);
}
public void Start()
@@ -153,35 +148,18 @@ namespace OpenMetaverse.Capabilities
HttpRequestSignature signature = new HttpRequestSignature(context);
// Look for a signature match in our handlers
for (int i = 0; i < requestHandlers.Count; i++)
lock (requestHandlers)
{
HttpRequestHandler handler = requestHandlers[i];
if (signature == handler.Signature)
for (int i = 0; i < requestHandlers.Count; i++)
{
// Request signature matched, handle it
try
{
handler.Callback(signature, ref context);
}
catch (Exception e)
{
try
{
context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
context.Response.StatusDescription = e.ToString();
}
catch (Exception)
{
Logger.Log(e.ToString(), Helpers.LogLevel.Error);
}
}
finally
{
context.Response.Close();
}
HttpRequestHandler handler = requestHandlers[i];
return;
if (signature == handler.Signature)
{
// Request signature matched, handle it
handler.Callback(signature, ref context);
return;
}
}
}