From 75f9b25b41b5a80025e17808b5b2d9fe7295d54e Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Tue, 5 Jun 2007 13:18:44 +0000 Subject: * Fixed OGS build * Converted to new console interfaces * Fixed other minor issues which somehow snuck in --- OpenGridServices/ServiceManager/ServiceManager.cs | 54 +++++++++++------------ 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'OpenGridServices/ServiceManager/ServiceManager.cs') diff --git a/OpenGridServices/ServiceManager/ServiceManager.cs b/OpenGridServices/ServiceManager/ServiceManager.cs index 1de9475..8200b5b 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.cs +++ b/OpenGridServices/ServiceManager/ServiceManager.cs @@ -52,8 +52,8 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase { XmlNode rootnode = doc.FirstChild; if (rootnode.Name != "regions") { - EventLog.WriteEntry("ERROR! bad XML in opengrid-master-cfg.xml - expected regions tag"); - Console.WriteLine("Sorry, could not startup the service - please check your opengrid-master-cfg.xml file: missing regions tag"); + EventLog.WriteEntry("ERROR! bad XML in opengrid-master-cfg.xml - expected regions tag"); + Console.WriteLine("Sorry, could not startup the service - please check your opengrid-master-cfg.xml file: missing regions tag"); (new ServiceController("OpenGridServices-master")).Stop(); } @@ -72,8 +72,8 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase { } private static string SetupGrid() - { - Console.WriteLine("Running external program (OpenGridServices.GridServer.exe) to configure the grid server"); + { + Console.WriteLine("Running external program (OpenGridServices.GridServer.exe) to configure the grid server"); try { Process p = new Process(); @@ -92,8 +92,8 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase { string configxml = reader.ReadToEnd(); return configxml; - } catch(Exception e) { - Console.WriteLine("An error occurred while running the grid server, please rectify it and try again"); + } catch(Exception e) { + Console.WriteLine("An error occurred while running the grid server, please rectify it and try again"); Console.WriteLine(e.ToString()); Environment.Exit(1); } @@ -121,9 +121,9 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase { string listenaddr; string simconfigxml; - LLUUID SimUUID; - - Console.WriteLine("Setting up region servers"); + LLUUID SimUUID; + + Console.WriteLine("Setting up region servers"); Console.Write("Please specify a path to store your region data (e.g /etc/opensim/regions: "); string regionpath=Console.ReadLine(); @@ -134,11 +134,11 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase { baseport=Convert.ToUInt16(Console.ReadLine()); - listenaddr=Console.ReadLine(); - - Console.WriteLine("Now ready to configure regions, please answer the questions about each region in turn"); - for(int i=0; i<=numofregions; i++) { - Console.WriteLine("Configuring region number " + i.ToString()); + listenaddr=Console.ReadLine(); + + Console.WriteLine("Now ready to configure regions, please answer the questions about each region in turn"); + for(int i=0; i<=numofregions; i++) { + Console.WriteLine("Configuring region number " + i.ToString()); Console.Write("Region name: "); regionname=Console.ReadLine(); @@ -177,13 +177,13 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase { bool region=false; while(choice!="OK") { - Console.Clear(); - Console.WriteLine("Please select the components you would like to run on this server:\n"); - - Console.WriteLine("1 - [" + (grid ? "X" : " ") + "] Grid server - this service handles co-ordinates of regions/sims on the grid"); - Console.WriteLine("2 - [" + (user ? "X" : " ") + "] User server - this service handles user login, profiles, inventory and IM"); - Console.WriteLine("3 - [" + (asset ? "X" : " ") + "] Asset server - this service handles storage of assets such as textures, objects, sounds, scripts"); - Console.WriteLine("4 - [" + (region ? "X" : " ") + "] Region server - this is the main opensim server and can run without the above services, it handles physics simulation, terrain, building and other such features"); + Console.Clear(); + Console.WriteLine("Please select the components you would like to run on this server:\n"); + + Console.WriteLine("1 - [" + (grid ? "X" : " ") + "] Grid server - this service handles co-ordinates of regions/sims on the grid"); + Console.WriteLine("2 - [" + (user ? "X" : " ") + "] User server - this service handles user login, profiles, inventory and IM"); + Console.WriteLine("3 - [" + (asset ? "X" : " ") + "] Asset server - this service handles storage of assets such as textures, objects, sounds, scripts"); + Console.WriteLine("4 - [" + (region ? "X" : " ") + "] Region server - this is the main opensim server and can run without the above services, it handles physics simulation, terrain, building and other such features"); Console.Write("Type a number to toggle a choice or type OK to accept your current choices: "); @@ -217,15 +217,15 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase { public static void Main() { if(!File.Exists("opengrid-master-cfg.xml")) - { - Console.WriteLine("Could not find a config file, running initial setup"); + { + Console.WriteLine("Could not find a config file, running initial setup"); InitSetup(); - } - Console.WriteLine("Starting up OGS master service"); + } + Console.WriteLine("Starting up OGS master service"); try { ServiceBase.Run(new OpenGridMasterService()); - } catch(Exception e) { - Console.WriteLine("THIS SHOULD NEVER HAPPEN!!!!!!!!!!!!!!!!!!!!!"); + } catch(Exception e) { + Console.WriteLine("THIS SHOULD NEVER HAPPEN!!!!!!!!!!!!!!!!!!!!!"); Console.WriteLine(e.ToString()); } } -- cgit v1.1