diff options
author | gareth | 2007-05-14 03:13:47 +0000 |
---|---|---|
committer | gareth | 2007-05-14 03:13:47 +0000 |
commit | 64a98c736848de6099254f23483058668273c1a5 (patch) | |
tree | a8f2624277e48814531750db0ec07a8d64c1f740 /OpenGridServices.GridServer | |
parent | Added skeleton for grid management agent (diff) | |
download | opensim-SC_OLD-64a98c736848de6099254f23483058668273c1a5.zip opensim-SC_OLD-64a98c736848de6099254f23483058668273c1a5.tar.gz opensim-SC_OLD-64a98c736848de6099254f23483058668273c1a5.tar.bz2 opensim-SC_OLD-64a98c736848de6099254f23483058668273c1a5.tar.xz |
Finished off adding the new management API to gridserver
Updated VersionInfo.cs finally
Updated prebuild and rebuilt nant build files
Completed Management agent basics
Diffstat (limited to '')
-rw-r--r-- | OpenGridServices.GridServer/Main.cs | 11 | ||||
-rw-r--r-- | OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build | 1 |
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; | |||
35 | using System.Threading; | 35 | using System.Threading; |
36 | using System.Reflection; | 36 | using System.Reflection; |
37 | using libsecondlife; | 37 | using libsecondlife; |
38 | using OpenGrid.Framework.Manager; | ||
38 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Sims; | 40 | using OpenSim.Framework.Sims; |
40 | using OpenSim.Framework.Console; | 41 | using 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" /> |