aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-06-18 23:07:18 +0100
committerJustin Clark-Casey (justincc)2013-06-18 23:07:18 +0100
commit9501a583cbc8fd819d2b13db4f9ad76958520ce7 (patch)
tree925a26099456963b6e87e0d35b6cc57f8a621bd9 /OpenSim/Server
parentFix issue where stat samples were accidentally static, so that any additional... (diff)
downloadopensim-SC_OLD-9501a583cbc8fd819d2b13db4f9ad76958520ce7.zip
opensim-SC_OLD-9501a583cbc8fd819d2b13db4f9ad76958520ce7.tar.gz
opensim-SC_OLD-9501a583cbc8fd819d2b13db4f9ad76958520ce7.tar.bz2
opensim-SC_OLD-9501a583cbc8fd819d2b13db4f9ad76958520ce7.tar.xz
Make number of inbound http requests handled available as a httpserver.<port>.IncomingHTTPRequestsProcessed stat
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 8243900..667cef8 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -34,6 +34,7 @@ using System.Text;
34using System.Xml; 34using System.Xml;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Monitoring;
37using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
38using log4net; 39using log4net;
39using log4net.Config; 40using log4net.Config;
@@ -205,6 +206,9 @@ namespace OpenSim.Server.Base
205 206
206 public virtual int Run() 207 public virtual int Run()
207 { 208 {
209 Watchdog.Enabled = true;
210 MemoryWatchdog.Enabled = true;
211
208 while (m_Running) 212 while (m_Running)
209 { 213 {
210 try 214 try