aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices.GridServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenGridServices.GridServer')
-rw-r--r--OpenGridServices.GridServer/Main.cs11
-rw-r--r--OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build1
2 files changed, 12 insertions, 0 deletions
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index 1a2a0fb..5d51edf 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -35,6 +35,7 @@ using System.Net;
35using System.Threading; 35using System.Threading;
36using System.Reflection; 36using System.Reflection;
37using libsecondlife; 37using libsecondlife;
38using OpenGrid.Framework.Manager;
38using OpenSim.Framework; 39using OpenSim.Framework;
39using OpenSim.Framework.Sims; 40using OpenSim.Framework.Sims;
40using OpenSim.Framework.Console; 41using OpenSim.Framework.Console;
@@ -91,6 +92,15 @@ namespace OpenGridServices.GridServer
91 92
92 } 93 }
93 94
95 public void managercallback(string cmd) {
96 switch(cmd) {
97 case "shutdown":
98 RunCmd("shutdown",new string[0]);
99 break;
100 }
101 }
102
103
94 public void Startup() 104 public void Startup()
95 { 105 {
96 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Loading configuration"); 106 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Loading configuration");
@@ -105,6 +115,7 @@ namespace OpenGridServices.GridServer
105 115
106 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process"); 116 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");
107 BaseHttpServer httpServer = new BaseHttpServer(8001); 117 BaseHttpServer httpServer = new BaseHttpServer(8001);
118 GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer,"gridserver",Cfg.SimSendKey,Cfg.SimRecvKey,managercallback);
108 119
109 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod); 120 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod);
110 121
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 774dab5..84e0a98 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
@@ -27,6 +27,7 @@
27 <include name="../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../bin/OpenSim.Framework.Console.dll" />
28 <include name="../bin/OpenSim.Servers.dll" /> 28 <include name="../bin/OpenSim.Servers.dll" />
29 <include name="../bin/OpenGrid.Framework.Data.dll" /> 29 <include name="../bin/OpenGrid.Framework.Data.dll" />
30 <include name="../bin/OpenGrid.Framework.Manager.dll" />
30 <include name="../bin/libsecondlife.dll" /> 31 <include name="../bin/libsecondlife.dll" />
31 <include name="../bin/Db4objects.Db4o.dll" /> 32 <include name="../bin/Db4objects.Db4o.dll" />
32 <include name="../bin/XMLRPC.dll" /> 33 <include name="../bin/XMLRPC.dll" />