remove the pointless slashes on the end of the (5!) different server stat retrieval mechanisms.
Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/ Can't do this with webstats yet since it does insane things to the path.0.7.2-post-fixes
parent
d1711519a0
commit
31d1b3310d
|
@ -728,7 +728,7 @@ namespace OpenSim
|
|||
|
||||
public string Path
|
||||
{
|
||||
get { return "/simstatus/"; }
|
||||
get { return "/simstatus"; }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -766,7 +766,7 @@ namespace OpenSim
|
|||
public string Path
|
||||
{
|
||||
// This is for the OpenSimulator instance and is the osSecret hashed
|
||||
get { return "/" + osXStatsURI + "/"; }
|
||||
get { return "/" + osXStatsURI; }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -807,7 +807,7 @@ namespace OpenSim
|
|||
public string Path
|
||||
{
|
||||
// This is for the OpenSimulator instance and is the user provided URI
|
||||
get { return "/" + osUXStatsURI + "/"; }
|
||||
get { return "/" + osUXStatsURI; }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
|
|||
"Returns a variety of statistics about the current region and/or simulator",
|
||||
DebugMonitors);
|
||||
|
||||
MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID + "/", StatsPage);
|
||||
MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID, StatsPage);
|
||||
}
|
||||
|
||||
public Hashtable StatsPage(Hashtable request)
|
||||
|
|
|
@ -36,7 +36,6 @@ using OpenMetaverse;
|
|||
using OpenMetaverse.StructuredData;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Communications;
|
||||
|
||||
using OpenSim.Framework.Console;
|
||||
using OpenSim.Framework.Servers;
|
||||
using OpenSim.Framework.Servers.HttpServer;
|
||||
|
@ -45,12 +44,8 @@ using OpenSim.Region.Framework;
|
|||
using OpenSim.Region.Framework.Interfaces;
|
||||
using OpenSim.Region.Framework.Scenes;
|
||||
|
||||
|
||||
|
||||
namespace OpenSim.Region.Framework.Scenes
|
||||
{
|
||||
|
||||
|
||||
public class RegionStatsHandler : IStreamedRequestHandler
|
||||
{
|
||||
private string osRXStatsURI = String.Empty;
|
||||
|
@ -67,7 +62,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
regionInfo = region_info;
|
||||
osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret);
|
||||
osXStatsURI = Util.SHA1Hash(regionInfo.osSecret);
|
||||
|
||||
}
|
||||
|
||||
public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
|
||||
|
@ -88,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
public string Path
|
||||
{
|
||||
// This is for the region and is the regionSecret hashed
|
||||
get { return "/" + osRXStatsURI + "/"; }
|
||||
get { return "/" + osRXStatsURI; }
|
||||
}
|
||||
|
||||
private string Report()
|
||||
|
@ -106,7 +100,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
strBuffer = OSDParser.SerializeJsonString(args);
|
||||
|
||||
return strBuffer;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue