diff options
Diffstat (limited to 'OpenGridServices.GridServer')
-rw-r--r-- | OpenGridServices.GridServer/GridHttp.cs | 13 | ||||
-rw-r--r-- | OpenGridServices.GridServer/Main.cs | 1 |
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 | |||
49 | public HttpListener Listener; | 49 | public HttpListener Listener; |
50 | 50 | ||
51 | public GridHTTPServer() : base( 8001 ) { | 51 | public GridHTTPServer() : base( 8001 ) { |
52 | MainConsole.Instance.WriteLine("Starting up HTTP Server"); | 52 | Start(); |
53 | HTTPD = new Thread(new ThreadStart(StartHTTP)); | ||
54 | HTTPD.Start(); | ||
55 | } | 53 | } |
56 | 54 | ||
57 | public void StartHTTP() { | 55 | public void Start() |
56 | { | ||
57 | MainConsole.Instance.WriteLine("Starting up HTTP Server"); | ||
58 | HTTPD = new Thread(new ThreadStart(StartHTTP)); | ||
59 | HTTPD.Start(); | ||
60 | } | ||
61 | |||
62 | public void StartHTTP() { | ||
58 | MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK"); | 63 | MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK"); |
59 | Listener = new HttpListener(); | 64 | Listener = new HttpListener(); |
60 | 65 | ||
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 | |||
105 | 105 | ||
106 | m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); | 106 | m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); |
107 | _httpd = new GridHTTPServer(); | 107 | _httpd = new GridHTTPServer(); |
108 | _httpd.Start(); | ||
108 | 109 | ||
109 | m_console.WriteLine("Main.cs:Startup() - Starting sim status checker"); | 110 | m_console.WriteLine("Main.cs:Startup() - Starting sim status checker"); |
110 | SimCheckTimer = new Timer(); | 111 | SimCheckTimer = new Timer(); |