aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-15 02:51:52 +0100
committerJustin Clark-Casey (justincc)2012-06-15 02:51:52 +0100
commit94517c8d5c63f9e8a1ea9a83b04db956f27aa25d (patch)
treeb38f309e24df668dc9b422daf69ce9273e09dee7 /OpenSim/Region/Application
parentAdd main instance to internal MainServer.m_Servers list to simplify internal ... (diff)
downloadopensim-SC_OLD-94517c8d5c63f9e8a1ea9a83b04db956f27aa25d.zip
opensim-SC_OLD-94517c8d5c63f9e8a1ea9a83b04db956f27aa25d.tar.gz
opensim-SC_OLD-94517c8d5c63f9e8a1ea9a83b04db956f27aa25d.tar.bz2
opensim-SC_OLD-94517c8d5c63f9e8a1ea9a83b04db956f27aa25d.tar.xz
Make the "debug http" command available for robust as well as the simulator. This allows one to see incoming requests as they happen.
This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs34
1 files changed, 2 insertions, 32 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index abb30a9..faa9e09 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,16 +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 non-poll http request debugging for everything except the event queue (see debug eq).",
254 "If level <= 0, then no extra logging is done.\n"
255 + "If level >= 1, then short warnings are logged when receiving bad input data.\n"
256 + "If level >= 2, then long warnings are logged when receiving bad input data.\n"
257 + "If level >= 3, then short notices about all incoming non-poll HTTP requests are logged.\n"
258 + "If no level is specified then the current level is returned.",
259 Debug);
260
261 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);
262 254
263 m_console.Commands.AddCommand("Regions", false, "debug scene", 255 m_console.Commands.AddCommand("Regions", false, "debug scene",
@@ -916,28 +908,6 @@ namespace OpenSim
916 908
917 break; 909 break;
918 910
919 case "http":
920 if (args.Length == 3)
921 {
922 int newDebug;
923 if (int.TryParse(args[2], out newDebug))
924 {
925 MainServer.DebugLevel = newDebug;
926 MainConsole.Instance.OutputFormat("Debug http level set to {0}", newDebug);
927 break;
928 }
929 }
930 else if (args.Length == 2)
931 {
932 MainConsole.Instance.OutputFormat("Current debug http level is {0}", MainServer.DebugLevel);
933 }
934 else
935 {
936 MainConsole.Instance.Output("Usage: debug http 0..3");
937 }
938
939 break;
940
941 case "scene": 911 case "scene":
942 if (args.Length == 4) 912 if (args.Length == 4)
943 { 913 {