* 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, 10 insertions, 4 deletions

diff --git a/OpenGridServices.GridServer/GridHttp.cs b/OpenGridServices.GridServer/GridHttp.cs
index 5f8bd56..9e9246d 100644
--- a/OpenGridServices.GridServer/GridHttp.cs
+++ b/OpenGridServices.GridServer/GridHttp.cs
@@ -49,12 +49,17 @@ namespace OpenGridServices.GridServer
                 public HttpListener Listener;

         

                 public GridHTTPServer() : base( 8001 ) {

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

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

-                        HTTPD.Start();

+                    Start();

                 }

 

-                public void StartHTTP() {

+            public void Start()

+            {

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

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

+                HTTPD.Start();

+            }

+

+            public void StartHTTP() {

                         MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK");

                         Listener = new HttpListener();

 

diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index 192b10c..8c83bbf 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -105,6 +105,7 @@ namespace OpenGridServices.GridServer
 

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

             _httpd = new GridHTTPServer();

+            _httpd.Start();

 

             m_console.WriteLine("Main.cs:Startup() - Starting sim status checker");

             SimCheckTimer = new Timer();