aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-07 00:30:35 +0100
committerJustin Clark-Casey (justincc)2011-10-07 00:30:35 +0100
commit1f78dc65041729567edc411a3e63dd9a32a268a3 (patch)
treec32c976ab9088dff3804fb107ad2b3168e728c4a /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-1f78dc65041729567edc411a3e63dd9a32a268a3.zip
opensim-SC_OLD-1f78dc65041729567edc411a3e63dd9a32a268a3.tar.gz
opensim-SC_OLD-1f78dc65041729567edc411a3e63dd9a32a268a3.tar.bz2
opensim-SC_OLD-1f78dc65041729567edc411a3e63dd9a32a268a3.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs11
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index d25d5dd..4578236 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -36,7 +36,6 @@ using OpenMetaverse;
36using OpenMetaverse.StructuredData; 36using OpenMetaverse.StructuredData;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39
40using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
41using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
42using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
@@ -45,12 +44,8 @@ using OpenSim.Region.Framework;
45using OpenSim.Region.Framework.Interfaces; 44using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Framework.Scenes; 45using OpenSim.Region.Framework.Scenes;
47 46
48
49
50namespace OpenSim.Region.Framework.Scenes 47namespace OpenSim.Region.Framework.Scenes
51{ 48{
52
53
54 public class RegionStatsHandler : IStreamedRequestHandler 49 public class RegionStatsHandler : IStreamedRequestHandler
55 { 50 {
56 private string osRXStatsURI = String.Empty; 51 private string osRXStatsURI = String.Empty;
@@ -67,7 +62,6 @@ namespace OpenSim.Region.Framework.Scenes
67 regionInfo = region_info; 62 regionInfo = region_info;
68 osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret); 63 osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret);
69 osXStatsURI = Util.SHA1Hash(regionInfo.osSecret); 64 osXStatsURI = Util.SHA1Hash(regionInfo.osSecret);
70
71 } 65 }
72 66
73 public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) 67 public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
@@ -88,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
88 public string Path 82 public string Path
89 { 83 {
90 // This is for the region and is the regionSecret hashed 84 // This is for the region and is the regionSecret hashed
91 get { return "/" + osRXStatsURI + "/"; } 85 get { return "/" + osRXStatsURI; }
92 } 86 }
93 87
94 private string Report() 88 private string Report()
@@ -106,7 +100,6 @@ namespace OpenSim.Region.Framework.Scenes
106 strBuffer = OSDParser.SerializeJsonString(args); 100 strBuffer = OSDParser.SerializeJsonString(args);
107 101
108 return strBuffer; 102 return strBuffer;
109
110 } 103 }
111 } 104 }
112} 105} \ No newline at end of file