diff options
Diffstat (limited to '')
4 files changed, 23 insertions, 37 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index f4812e6..f418d7b 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -231,6 +231,8 @@ namespace OpenSim | |||
231 | /// </summary> | 231 | /// </summary> |
232 | private void RegisterConsoleCommands() | 232 | private void RegisterConsoleCommands() |
233 | { | 233 | { |
234 | MainServer.RegisterHttpConsoleCommands(m_console); | ||
235 | |||
234 | m_console.Commands.AddCommand("Objects", false, "force update", | 236 | m_console.Commands.AddCommand("Objects", false, "force update", |
235 | "force update", | 237 | "force update", |
236 | "Force the update of all objects on clients", | 238 | "Force the update of all objects on clients", |
@@ -248,14 +250,6 @@ namespace OpenSim | |||
248 | + "If an avatar name is given then only packets from that avatar are logged", | 250 | + "If an avatar name is given then only packets from that avatar are logged", |
249 | Debug); | 251 | Debug); |
250 | 252 | ||
251 | m_console.Commands.AddCommand("Comms", false, "debug http", | ||
252 | "debug http <level>", | ||
253 | "Turn on inbound http request debugging for everything except the event queue (see debug eq).", | ||
254 | "If level >= 2 then the handler used to service the request is logged.\n" | ||
255 | + "If level >= 1 then incoming HTTP requests are logged.\n" | ||
256 | + "If level <= 0 then no extra http logging is done.\n", | ||
257 | Debug); | ||
258 | |||
259 | m_console.Commands.AddCommand("Comms", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug); | 253 | m_console.Commands.AddCommand("Comms", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug); |
260 | 254 | ||
261 | m_console.Commands.AddCommand("Regions", false, "debug scene", | 255 | m_console.Commands.AddCommand("Regions", false, "debug scene", |
@@ -914,21 +908,6 @@ namespace OpenSim | |||
914 | 908 | ||
915 | break; | 909 | break; |
916 | 910 | ||
917 | case "http": | ||
918 | if (args.Length == 3) | ||
919 | { | ||
920 | int newDebug; | ||
921 | if (int.TryParse(args[2], out newDebug)) | ||
922 | { | ||
923 | MainServer.Instance.DebugLevel = newDebug; | ||
924 | MainConsole.Instance.OutputFormat("Debug http level set to {0}", newDebug); | ||
925 | break; | ||
926 | } | ||
927 | } | ||
928 | |||
929 | MainConsole.Instance.Output("Usage: debug http 0..2"); | ||
930 | break; | ||
931 | |||
932 | case "scene": | 911 | case "scene": |
933 | if (args.Length == 4) | 912 | if (args.Length == 4) |
934 | { | 913 | { |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs index c25b58c..cd70410 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs | |||
@@ -51,7 +51,16 @@ namespace OpenSim.Region.ClientStack.Linden.Tests | |||
51 | [SetUp] | 51 | [SetUp] |
52 | public void SetUp() | 52 | public void SetUp() |
53 | { | 53 | { |
54 | MainServer.Instance = new BaseHttpServer(9999, false, 9998, ""); | 54 | uint port = 9999; |
55 | uint sslPort = 9998; | ||
56 | |||
57 | // This is an unfortunate bit of clean up we have to do because MainServer manages things through static | ||
58 | // variables and the VM is not restarted between tests. | ||
59 | MainServer.RemoveHttpServer(port); | ||
60 | |||
61 | BaseHttpServer server = new BaseHttpServer(port, false, sslPort, ""); | ||
62 | MainServer.AddHttpServer(server); | ||
63 | MainServer.Instance = server; | ||
55 | 64 | ||
56 | IConfigSource config = new IniConfigSource(); | 65 | IConfigSource config = new IniConfigSource(); |
57 | config.AddConfig("Startup"); | 66 | config.AddConfig("Startup"); |
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 6e78d6d..c4324e8 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -94,22 +94,19 @@ namespace OpenSim.Region.ClientStack | |||
94 | m_log.InfoFormat("[REGION SERVER]: Starting HTTP server on port {0}", m_httpServerPort); | 94 | m_log.InfoFormat("[REGION SERVER]: Starting HTTP server on port {0}", m_httpServerPort); |
95 | m_httpServer.Start(); | 95 | m_httpServer.Start(); |
96 | 96 | ||
97 | MainServer.AddHttpServer(m_httpServer); | ||
97 | MainServer.Instance = m_httpServer; | 98 | MainServer.Instance = m_httpServer; |
98 | 99 | ||
99 | // "OOB" Server | 100 | // "OOB" Server |
100 | if (m_networkServersInfo.ssl_listener) | 101 | if (m_networkServersInfo.ssl_listener) |
101 | { | 102 | { |
102 | BaseHttpServer server = null; | 103 | BaseHttpServer server = new BaseHttpServer( |
103 | server = new BaseHttpServer( | ||
104 | m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path, | 104 | m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path, |
105 | m_networkServersInfo.cert_pass); | 105 | m_networkServersInfo.cert_pass); |
106 | // Add the server to m_Servers | 106 | |
107 | if(server != null) | 107 | m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port); |
108 | { | 108 | MainServer.AddHttpServer(server); |
109 | m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port); | 109 | server.Start(); |
110 | MainServer.AddHttpServer(server); | ||
111 | server.Start(); | ||
112 | } | ||
113 | } | 110 | } |
114 | 111 | ||
115 | base.StartupSpecific(); | 112 | base.StartupSpecific(); |
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index 40ffcb4..0003af2 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | |||
@@ -131,11 +131,12 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
131 | { | 131 | { |
132 | // Start http server | 132 | // Start http server |
133 | // Attach xmlrpc handlers | 133 | // Attach xmlrpc handlers |
134 | m_log.Info("[XML RPC MODULE]: " + | 134 | // m_log.InfoFormat( |
135 | "Starting up XMLRPC Server on port " + m_remoteDataPort + " for llRemoteData commands."); | 135 | // "[XML RPC MODULE]: Starting up XMLRPC Server on port {0} for llRemoteData commands.", |
136 | BaseHttpServer httpServer = new BaseHttpServer((uint) m_remoteDataPort); | 136 | // m_remoteDataPort); |
137 | |||
138 | IHttpServer httpServer = MainServer.GetHttpServer((uint)m_remoteDataPort); | ||
137 | httpServer.AddXmlRPCHandler("llRemoteData", XmlRpcRemoteData); | 139 | httpServer.AddXmlRPCHandler("llRemoteData", XmlRpcRemoteData); |
138 | httpServer.Start(); | ||
139 | } | 140 | } |
140 | } | 141 | } |
141 | 142 | ||