aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices/OpenGridServices.GridServer/Main.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-06-05 13:18:44 +0000
committerAdam Frisby2007-06-05 13:18:44 +0000
commit75f9b25b41b5a80025e17808b5b2d9fe7295d54e (patch)
treecd96e948447cc9a030c7ce537d25da06ea40db5e /OpenGridServices/OpenGridServices.GridServer/Main.cs
parent* "We are" message is now a status text message. (diff)
downloadopensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.zip
opensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.gz
opensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.bz2
opensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.xz
* Fixed OGS build
* Converted to new console interfaces * Fixed other minor issues which somehow snuck in
Diffstat (limited to '')
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/Main.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenGridServices/OpenGridServices.GridServer/Main.cs b/OpenGridServices/OpenGridServices.GridServer/Main.cs
index 71f878a..9aabae1 100644
--- a/OpenGridServices/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.GridServer/Main.cs
@@ -116,17 +116,17 @@ namespace OpenGridServices.GridServer
116 this.ConfigDB(this.localXMLConfig); 116 this.ConfigDB(this.localXMLConfig);
117 this.localXMLConfig.Close(); 117 this.localXMLConfig.Close();
118 118
119 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Loading configuration"); 119 m_console.Verbose( "Main.cs:Startup() - Loading configuration");
120 Cfg = this.LoadConfigDll(this.ConfigDll); 120 Cfg = this.LoadConfigDll(this.ConfigDll);
121 Cfg.InitConfig(); 121 Cfg.InitConfig();
122 if (setuponly) Environment.Exit(0); 122 if (setuponly) Environment.Exit(0);
123 123
124 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Connecting to Storage Server"); 124 m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server");
125 m_gridManager = new GridManager(); 125 m_gridManager = new GridManager();
126 m_gridManager.AddPlugin(GridDll); // Made of win 126 m_gridManager.AddPlugin(GridDll); // Made of win
127 m_gridManager.config = Cfg; 127 m_gridManager.config = Cfg;
128 128
129 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP process"); 129 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
130 BaseHttpServer httpServer = new BaseHttpServer(8001); 130 BaseHttpServer httpServer = new BaseHttpServer(8001);
131 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); 131 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
132 132
@@ -143,7 +143,7 @@ namespace OpenGridServices.GridServer
143 // I have no idea what this was supposed to do - looks like an infinite recursion to me. 143 // I have no idea what this was supposed to do - looks like an infinite recursion to me.
144 // case "regions": 144 // case "regions":
145 //// DIRTY HACK ALERT 145 //// DIRTY HACK ALERT
146 //Console.WriteLine("/regions/ accessed"); 146 //Console.Notice("/regions/ accessed");
147 //TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1])); 147 //TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1]));
148 //respstring = ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod); 148 //respstring = ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod);
149 //break; 149 //break;
@@ -155,7 +155,7 @@ namespace OpenGridServices.GridServer
155 155
156 httpServer.Start(); 156 httpServer.Start();
157 157
158 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting sim status checker"); 158 m_console.Verbose( "Main.cs:Startup() - Starting sim status checker");
159 159
160 System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates. 160 System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates.
161 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); 161 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
@@ -232,7 +232,7 @@ namespace OpenGridServices.GridServer
232 switch (cmd) 232 switch (cmd)
233 { 233 {
234 case "help": 234 case "help":
235 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - shutdown the grid (USE CAUTION!)"); 235 m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
236 break; 236 break;
237 237
238 case "shutdown": 238 case "shutdown":