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

move RegionStatsHandler

master
UbitUmarov 2020-04-27 00:54:32 +01:00
parent 8526f938f7
commit 6ffb5bcf23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -489,7 +489,7 @@ namespace OpenSim
scene.LoadPrimsFromStorage(regionInfo.originRegionID); scene.LoadPrimsFromStorage(regionInfo.originRegionID);
// TODO : Try setting resource for region xstats here on scene // TODO : Try setting resource for region xstats here on scene
MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo)); MainServer.Instance.AddSimpleStreamHandler(new RegionSimpleStatsHandler(regionInfo));
if (scene.SnmpService != null) if (scene.SnmpService != null)
{ {

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

@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Framework.Scenes namespace OpenSim.Region.Framework.Scenes
{ {
public class RegionStatsHandler : BaseStreamHandler public class RegionSimpleStatsHandler : SimpleStreamHandler
{ {
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -55,22 +55,26 @@ namespace OpenSim.Region.Framework.Scenes
public string localZone = TimeZone.CurrentTimeZone.StandardName; public string localZone = TimeZone.CurrentTimeZone.StandardName;
public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now); public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
public RegionStatsHandler(RegionInfo region_info) public RegionSimpleStatsHandler(RegionInfo region_info) : base("/" + Util.SHA1Hash(region_info.regionSecret))
: base("GET", "/" + Util.SHA1Hash(region_info.regionSecret), "RegionStats", "Region Statistics")
{ {
regionInfo = region_info; regionInfo = region_info;
osXStatsURI = Util.SHA1Hash(regionInfo.osSecret); osXStatsURI = Util.SHA1Hash(regionInfo.osSecret);
} }
protected override byte[] ProcessRequest( protected override void ProcessRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
return Util.UTF8.GetBytes(Report()); if (regionInfo == null)
} {
httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
return;
}
public override string ContentType if (httpRequest.HttpMethod != "GET")
{ {
get { return "text/plain"; } httpResponse.StatusCode = (int)HttpStatusCode.NotFound;
return;
}
httpResponse.RawBuffer = Util.UTF8.GetBytes(Report());
} }
private string Report() private string Report()