diff options
| author | gareth | 2007-05-14 01:50:13 +0000 |
|---|---|---|
| committer | gareth | 2007-05-14 01:50:13 +0000 |
| commit | 5ba3fa962987b5e73757f2022964104748c38e19 (patch) | |
| tree | 1afcb55352c518939598d50734d489de2d9cd829 /ServiceManager | |
| parent | Now we just need that --setup option for all the apps..... (diff) | |
| download | opensim-SC-5ba3fa962987b5e73757f2022964104748c38e19.zip opensim-SC-5ba3fa962987b5e73757f2022964104748c38e19.tar.gz opensim-SC-5ba3fa962987b5e73757f2022964104748c38e19.tar.bz2 opensim-SC-5ba3fa962987b5e73757f2022964104748c38e19.tar.xz | |
Added -setuponly switch to gridserver
KILLED THE GRIDSERVER'S CONSOLE VICIOUSLY AND WITHOUT MERCY!!!!
Added gridserver setup to InitSetup() in ServiceManager
Diffstat (limited to 'ServiceManager')
| -rw-r--r-- | ServiceManager/ServiceManager.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ServiceManager/ServiceManager.cs b/ServiceManager/ServiceManager.cs index 6cd2113..b21a5b1 100644 --- a/ServiceManager/ServiceManager.cs +++ b/ServiceManager/ServiceManager.cs | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | using System; | 1 | using System; |
| 2 | using System.Diagnostics; | ||
| 2 | using System.Threading; | 3 | using System.Threading; |
| 3 | using System.ServiceProcess; | 4 | using System.ServiceProcess; |
| 4 | using System.Xml; | 5 | using System.Xml; |
| @@ -65,8 +66,13 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase { | |||
| 65 | private static string SetupGrid() | 66 | private static string SetupGrid() |
| 66 | { | 67 | { |
| 67 | Console.WriteLine("Running external program (OpenGridServices.GridServer.exe) to configure the grid server"); | 68 | Console.WriteLine("Running external program (OpenGridServices.GridServer.exe) to configure the grid server"); |
| 68 | // TODO: Drop the console! and then configure using CLI params and/or XML files | 69 | Process p = new Process(); |
| 69 | return "<grid></grid>"; | 70 | |
| 71 | p.StartInfo.Arguments = "-setuponly"; | ||
| 72 | p.StartInfo.FileName = "OpenGridServices.GridServer.exe"; | ||
| 73 | p.Start(); | ||
| 74 | |||
| 75 | return "<gridserver />"; // we let the gridserver handle it's own setup | ||
| 70 | } | 76 | } |
| 71 | 77 | ||
| 72 | private static string SetupUser() | 78 | private static string SetupUser() |