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

Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge

avinationmerge
Melanie 2011-10-12 07:04:28 +01:00
parent 65aed5f1d3 1f78dc6504
commit b251423b11
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -811,7 +811,7 @@ namespace OpenSim
public string Path public string Path
{ {
get { return "/simstatus/"; } get { return "/simstatus"; }
} }
} }
@ -849,7 +849,7 @@ namespace OpenSim
public string Path public string Path
{ {
// This is for the OpenSimulator instance and is the osSecret hashed // This is for the OpenSimulator instance and is the osSecret hashed
get { return "/" + osXStatsURI + "/"; } get { return "/" + osXStatsURI; }
} }
} }
@ -890,7 +890,7 @@ namespace OpenSim
public string Path public string Path
{ {
// This is for the OpenSimulator instance and is the user provided URI // This is for the OpenSimulator instance and is the user provided URI
get { return "/" + osUXStatsURI + "/"; } get { return "/" + osUXStatsURI; }
} }
} }

2
OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
View File

@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
"Returns a variety of statistics about the current region and/or simulator", "Returns a variety of statistics about the current region and/or simulator",
DebugMonitors); DebugMonitors);
MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID + "/", StatsPage); MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID, StatsPage);
} }
public Hashtable StatsPage(Hashtable request) public Hashtable StatsPage(Hashtable request)

9
OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
View File

@ -36,7 +36,6 @@ using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
@ -45,12 +44,8 @@ using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Framework.Scenes namespace OpenSim.Region.Framework.Scenes
{ {
public class RegionStatsHandler : IStreamedRequestHandler public class RegionStatsHandler : IStreamedRequestHandler
{ {
private string osRXStatsURI = String.Empty; private string osRXStatsURI = String.Empty;
@ -67,7 +62,6 @@ namespace OpenSim.Region.Framework.Scenes
regionInfo = region_info; regionInfo = region_info;
osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret); osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret);
osXStatsURI = Util.SHA1Hash(regionInfo.osSecret); osXStatsURI = Util.SHA1Hash(regionInfo.osSecret);
} }
public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
@ -88,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
public string Path public string Path
{ {
// This is for the region and is the regionSecret hashed // This is for the region and is the regionSecret hashed
get { return "/" + osRXStatsURI + "/"; } get { return "/" + osRXStatsURI; }
} }
private string Report() private string Report()
@ -106,7 +100,6 @@ namespace OpenSim.Region.Framework.Scenes
strBuffer = OSDParser.SerializeJsonString(args); strBuffer = OSDParser.SerializeJsonString(args);
return strBuffer; return strBuffer;
} }
} }
} }