From 94517c8d5c63f9e8a1ea9a83b04db956f27aa25d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Jun 2012 02:51:52 +0100
Subject: 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.
---
 OpenSim/Region/Application/OpenSim.cs | 34 ++--------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

(limited to 'OpenSim/Region')

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
         /// </summary>
         private void RegisterConsoleCommands()
         {
+            MainServer.RegisterHttpConsoleCommands(m_console);
+
             m_console.Commands.AddCommand("Objects", false, "force update",
                                           "force update",
                                           "Force the update of all objects on clients",
@@ -248,16 +250,6 @@ namespace OpenSim
                                           + "If an avatar name is given then only packets from that avatar are logged",
                                           Debug);
 
-            m_console.Commands.AddCommand("Comms", false, "debug http",
-                                          "debug http [<level>]",
-                                          "Turn on inbound non-poll http request debugging for everything except the event queue (see debug eq).",
-                                            "If level <= 0, then no extra logging is done.\n"
-                                          + "If level >= 1, then short warnings are logged when receiving bad input data.\n"
-                                          + "If level >= 2, then long warnings are logged when receiving bad input data.\n"
-                                          + "If level >= 3, then short notices about all incoming non-poll HTTP requests are logged.\n"
-                                          + "If no level is specified then the current level is returned.",
-                                          Debug);
-
             m_console.Commands.AddCommand("Comms", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug);
 
             m_console.Commands.AddCommand("Regions", false, "debug scene",
@@ -916,28 +908,6 @@ namespace OpenSim
 
                     break;
 
-                case "http":
-                    if (args.Length == 3)
-                    {
-                        int newDebug;
-                        if (int.TryParse(args[2], out newDebug))
-                        {
-                            MainServer.DebugLevel = newDebug;
-                            MainConsole.Instance.OutputFormat("Debug http level set to {0}", newDebug);
-                            break;
-                        }
-                    }
-                    else if (args.Length == 2)
-                    {
-                        MainConsole.Instance.OutputFormat("Current debug http level is {0}", MainServer.DebugLevel);
-                    }
-                    else
-                    {
-                        MainConsole.Instance.Output("Usage: debug http 0..3");
-                    }
-
-                    break;
-
                 case "scene":
                     if (args.Length == 4)
                     {
-- 
cgit v1.1