From d9bd6e6b5be3100141a3b1202f859c65a302d4ee Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 8 Aug 2013 09:41:11 -0700
Subject: Add parameter and explanation of ManagedStats return to
 OpenSimDefaults.ini. Add 'callback' query parameter to managed stats return
 to return function form of JSON data.

---
 OpenSim/Framework/Monitoring/StatsManager.cs | 6 ++++++
 OpenSim/Region/Application/OpenSim.cs        | 4 ++--
 bin/OpenSimDefaults.ini                      | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 23c6f18..7cf1fa7 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -281,6 +281,12 @@ namespace OpenSim.Framework.Monitoring
 
             string strOut = StatsManager.GetStatsAsOSDMap(pCategoryName, pContainerName, pStatName).ToString();
 
+            // If requestor wants it as a callback function, build response as a function rather than just the JSON string.
+            if (request.ContainsKey("callback"))
+            {
+                strOut = request["callback"].ToString() + "(" + strOut + ");";
+            }
+
             // m_log.DebugFormat("{0} StatFetch: uri={1}, cat={2}, cont={3}, stat={4}, resp={5}",
             //                         LogHeader, regpath, pCategoryName, pContainerName, pStatName, strOut);
 
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 13fdb3b..1cdd868 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -175,8 +175,8 @@ namespace OpenSim
             if (managedStatsURI != String.Empty)
             {
                 string urlBase = String.Format("/{0}/", managedStatsURI);
-                MainServer.Instance.AddHTTPHandler(urlBase, StatsManager.HandleStatsRequest);
-                m_log.WarnFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase);
+                MainServer.Instance.AddHTTPHandler(urlBase, StatsManager.HandleStatsRequest);
+                m_log.InfoFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase);
             }
 
             if (m_console is RemoteConsole)
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index d5d29ec..0a85085 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -264,8 +264,15 @@
 
     ; Simulator Stats URI
     ; Enable JSON simulator data by setting a URI name (case sensitive)
+    ; Returns regular sim stats (SimFPS, ...)
     ; Stats_URI = "jsonSimStats"
 
+    ; Simulator StatsManager URI
+    ; Enable fetch of StatsManager registered stats. Fetch is query which can optionally
+    ; specify category, container and stat to fetch. If not selected, returns all of that type.
+    ; http://simulatorHTTPport/ManagedStats/?cat=Category&cont=Container&stat=Statistic
+    ; ManagedStatsRemoteFetchURI = "ManagedStats"
+
     ; Make OpenSim start all regions woth logins disabled. They will need
     ; to be enabled from the console if this is set
     ; StartDisabled = false
-- 
cgit v1.1