aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDan Lake2011-10-06 22:50:03 -0700
committerDan Lake2011-10-06 22:50:03 -0700
commitf26a966b8e79688ca2ed81c236492d694f34ac7d (patch)
treeccbe8444046ec641c39a4d38088dfee7bb0263db
parentRefactored "known child region" in ScenePresence. There were 4 different (diff)
parentremove the pointless slashes on the end of the (5!) different server stat ret... (diff)
downloadopensim-SC_OLD-f26a966b8e79688ca2ed81c236492d694f34ac7d.zip
opensim-SC_OLD-f26a966b8e79688ca2ed81c236492d694f34ac7d.tar.gz
opensim-SC_OLD-f26a966b8e79688ca2ed81c236492d694f34ac7d.tar.bz2
opensim-SC_OLD-f26a966b8e79688ca2ed81c236492d694f34ac7d.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs6
-rw-r--r--OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs11
3 files changed, 6 insertions, 13 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 6fba71e..e867bc2 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -728,7 +728,7 @@ namespace OpenSim
728 728
729 public string Path 729 public string Path
730 { 730 {
731 get { return "/simstatus/"; } 731 get { return "/simstatus"; }
732 } 732 }
733 } 733 }
734 734
@@ -766,7 +766,7 @@ namespace OpenSim
766 public string Path 766 public string Path
767 { 767 {
768 // This is for the OpenSimulator instance and is the osSecret hashed 768 // This is for the OpenSimulator instance and is the osSecret hashed
769 get { return "/" + osXStatsURI + "/"; } 769 get { return "/" + osXStatsURI; }
770 } 770 }
771 } 771 }
772 772
@@ -807,7 +807,7 @@ namespace OpenSim
807 public string Path 807 public string Path
808 { 808 {
809 // This is for the OpenSimulator instance and is the user provided URI 809 // This is for the OpenSimulator instance and is the user provided URI
810 get { return "/" + osUXStatsURI + "/"; } 810 get { return "/" + osUXStatsURI; }
811 } 811 }
812 } 812 }
813 813
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index b5cbcbb..09095c2 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
73 "Returns a variety of statistics about the current region and/or simulator", 73 "Returns a variety of statistics about the current region and/or simulator",
74 DebugMonitors); 74 DebugMonitors);
75 75
76 MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID + "/", StatsPage); 76 MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID, StatsPage);
77 } 77 }
78 78
79 public Hashtable StatsPage(Hashtable request) 79 public Hashtable StatsPage(Hashtable request)
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