OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
0.7.6-extended
Robert Adams 2013-08-08 09:41:11 -07:00
parent c67c55e0fc
commit d9bd6e6b5b
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Monitoring/StatsManager.cs
View File

@ -281,6 +281,12 @@ namespace OpenSim.Framework.Monitoring
string strOut = StatsManager.GetStatsAsOSDMap(pCategoryName, pContainerName, pStatName).ToString(); 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}", // m_log.DebugFormat("{0} StatFetch: uri={1}, cat={2}, cont={3}, stat={4}, resp={5}",
// LogHeader, regpath, pCategoryName, pContainerName, pStatName, strOut); // LogHeader, regpath, pCategoryName, pContainerName, pStatName, strOut);

4
OpenSim/Region/Application/OpenSim.cs
View File

@ -175,8 +175,8 @@ namespace OpenSim
if (managedStatsURI != String.Empty) if (managedStatsURI != String.Empty)
{ {
string urlBase = String.Format("/{0}/", managedStatsURI); string urlBase = String.Format("/{0}/", managedStatsURI);
MainServer.Instance.AddHTTPHandler(urlBase, StatsManager.HandleStatsRequest); MainServer.Instance.AddHTTPHandler(urlBase, StatsManager.HandleStatsRequest);
m_log.WarnFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase); m_log.InfoFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase);
} }
if (m_console is RemoteConsole) if (m_console is RemoteConsole)

7
bin/OpenSimDefaults.ini
View File

@ -264,8 +264,15 @@
; Simulator Stats URI ; Simulator Stats URI
; Enable JSON simulator data by setting a URI name (case sensitive) ; Enable JSON simulator data by setting a URI name (case sensitive)
; Returns regular sim stats (SimFPS, ...)
; Stats_URI = "jsonSimStats" ; 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 ; Make OpenSim start all regions woth logins disabled. They will need
; to be enabled from the console if this is set ; to be enabled from the console if this is set
; StartDisabled = false ; StartDisabled = false