From 53839ac779aa8ed681a5153e07b8cc9720b315e3 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 12 Sep 2012 00:10:48 +0100
Subject: [PATCH] Make "show http-handlers" command available for ROBUST
 instances as well as the simulator executable.

---
 OpenSim/Framework/Servers/MainServer.cs | 51 +++++++++++++++++++++++++
 OpenSim/Region/Application/OpenSim.cs   | 31 ---------------
 2 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 1ac0953a64..b367b12512 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Net;
+using System.Text;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
@@ -104,6 +105,11 @@ namespace OpenSim.Framework.Servers
 
         public static void RegisterHttpConsoleCommands(ICommandConsole console)
         {
+            console.Commands.AddCommand(
+                "Comms", false, "show http-handlers",
+                "show http-handlers",
+                "Show all registered http handlers", HandleShowHttpHandlersCommand);
+
             console.Commands.AddCommand(
                 "Debug", false, "debug http", "debug http [<level>]",
                 "Turn on inbound non-poll http request debugging.",
@@ -142,6 +148,51 @@ namespace OpenSim.Framework.Servers
             }
         }
 
+        private static void HandleShowHttpHandlersCommand(string module, string[] args)
+        {
+            if (args.Length != 2)
+            {
+                MainConsole.Instance.Output("Usage: show http-handlers");
+                return;
+            }
+
+            StringBuilder handlers = new StringBuilder();
+
+            lock (m_Servers)
+            {
+                foreach (BaseHttpServer httpServer in m_Servers.Values)
+                {
+                    handlers.AppendFormat(
+                        "Registered HTTP Handlers for server at {0}:{1}\n", httpServer.ListenIPAddress, httpServer.Port);
+        
+                    handlers.AppendFormat("* XMLRPC:\n");
+                    foreach (String s in httpServer.GetXmlRpcHandlerKeys())
+                        handlers.AppendFormat("\t{0}\n", s);
+        
+                    handlers.AppendFormat("* HTTP:\n");
+                    List<String> poll = httpServer.GetPollServiceHandlerKeys();
+                    foreach (String s in httpServer.GetHTTPHandlerKeys())
+                        handlers.AppendFormat("\t{0} {1}\n", s, (poll.Contains(s) ? "(poll service)" : string.Empty));
+        
+                    handlers.AppendFormat("* Agent:\n");
+                    foreach (String s in httpServer.GetAgentHandlerKeys())
+                        handlers.AppendFormat("\t{0}\n", s);
+        
+                    handlers.AppendFormat("* LLSD:\n");
+                    foreach (String s in httpServer.GetLLSDHandlerKeys())
+                        handlers.AppendFormat("\t{0}\n", s);
+        
+                    handlers.AppendFormat("* StreamHandlers ({0}):\n", httpServer.GetStreamHandlerKeys().Count);
+                    foreach (String s in httpServer.GetStreamHandlerKeys())
+                        handlers.AppendFormat("\t{0}\n", s);
+
+                    handlers.Append("\n");
+                }
+            }
+
+            MainConsole.Instance.Output(handlers.ToString());
+        }
+
         /// <summary>
         /// Register an already started HTTP server to the collection of known servers.
         /// </summary>
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 470f0c92c3..1d5e21282f 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -328,10 +328,6 @@ namespace OpenSim
                                           "show circuits",
                                           "Show agent circuit data", HandleShow);
 
-            m_console.Commands.AddCommand("Comms", false, "show http-handlers",
-                                          "show http-handlers",
-                                          "Show all registered http handlers", HandleShow);
-
             m_console.Commands.AddCommand("Comms", false, "show pending-objects",
                                           "show pending-objects",
                                           "Show # of objects on the pending queues of all scene viewers", HandleShow);
@@ -1006,33 +1002,6 @@ namespace OpenSim
                     HandleShowCircuits();
                     break;
 
-                case "http-handlers":
-                    System.Text.StringBuilder handlers = new System.Text.StringBuilder("Registered HTTP Handlers:\n");
-
-                    handlers.AppendFormat("* XMLRPC:\n");
-                    foreach (String s in HttpServer.GetXmlRpcHandlerKeys())
-                        handlers.AppendFormat("\t{0}\n", s);
-
-                    handlers.AppendFormat("* HTTP:\n");
-                    List<String> poll = HttpServer.GetPollServiceHandlerKeys();
-                    foreach (String s in HttpServer.GetHTTPHandlerKeys())
-                        handlers.AppendFormat("\t{0} {1}\n", s, (poll.Contains(s) ? "(poll service)" : string.Empty));
-
-                    handlers.AppendFormat("* Agent:\n");
-                    foreach (String s in HttpServer.GetAgentHandlerKeys())
-                        handlers.AppendFormat("\t{0}\n", s);
-
-                    handlers.AppendFormat("* LLSD:\n");
-                    foreach (String s in HttpServer.GetLLSDHandlerKeys())
-                        handlers.AppendFormat("\t{0}\n", s);
-
-                    handlers.AppendFormat("* StreamHandlers ({0}):\n", HttpServer.GetStreamHandlerKeys().Count);
-                    foreach (String s in HttpServer.GetStreamHandlerKeys())
-                        handlers.AppendFormat("\t{0}\n", s);
-
-                    MainConsole.Instance.Output(handlers.ToString());
-                    break;
-
                 case "modules":
                     MainConsole.Instance.Output("The currently loaded shared modules are:");
                     foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)