* Started on converting UserHTTPServer to BaseHttpServer

* Added a 'param' param to the RestMethod
* Added RestHandlerEntry to store more info about the 'rest' handler

2 files changed, 14 insertions, 12 deletions

diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices.UserServer/Main.cs
index 9c128d3..9132a54 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices.UserServer/Main.cs
@@ -97,6 +97,12 @@ namespace OpenGridServices.UserServer
 

                         MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process");

                         _httpd = new UserHTTPServer();

+

+            _httpd.AddXmlRPCHandler("login_to_simulator", _profilemanager.XmlRpcLoginMethod);

+            _httpd.AddRestHandler( "DELETE", "/usersessions/", _profilemanager.RestDeleteUserSessionMethod );

+            

+                    _httpd.Start();

+

                 }

 

 
diff --git a/OpenGridServices.UserServer/UserHttp.cs b/OpenGridServices.UserServer/UserHttp.cs
index e1385f7..191fccb 100644
--- a/OpenGridServices.UserServer/UserHttp.cs
+++ b/OpenGridServices.UserServer/UserHttp.cs
@@ -52,6 +52,10 @@ namespace OpenGridServices.UserServer
 

         public UserHTTPServer() : base( 8002 )

         {

+        }

+

+        public void Start()

+        {

             MainConsole.Instance.WriteLine("Starting up HTTP Server");

             HTTPD = new Thread(new ThreadStart(StartHTTP));

             HTTPD.Start();

@@ -89,21 +93,13 @@ namespace OpenGridServices.UserServer
             switch (req_type)

             {

                 case "usersessions":

-                    LLUUID sessionid = new LLUUID(rest_params[2]);      // get usersessions/sessionid

+                    string param = rest_params[2];

+                    string result = "";

                     if (www_req.HttpMethod == "DELETE")

                     {

-                        foreach (libsecondlife.LLUUID UUID in OpenUser_Main.userserver._profilemanager.UserProfiles.Keys)

-                        {

-                            if (OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID == sessionid)

-                            {

-                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID = null;

-                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSecureSessionID = null;

-                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].Circuits.Clear();

-                            }

-                        }

-

+                       result = OpenUser_Main.userserver._profilemanager.RestDeleteUserSessionMethod( null, null, param );

                     }

-                    return "OK";

+                    return result;

             }

 

             return "";