diff options
author | Justin Clark-Casey (justincc) | 2012-07-25 23:27:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-25 23:27:00 +0100 |
commit | 5aec0ff207e9427b8756471eb003fd68859f67b1 (patch) | |
tree | 1b347a9086a1b07c696272b7e52dcbd7d98007e4 /OpenSim/Framework/Servers/HttpServer | |
parent | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. (diff) | |
download | opensim-SC_OLD-5aec0ff207e9427b8756471eb003fd68859f67b1.zip opensim-SC_OLD-5aec0ff207e9427b8756471eb003fd68859f67b1.tar.gz opensim-SC_OLD-5aec0ff207e9427b8756471eb003fd68859f67b1.tar.bz2 opensim-SC_OLD-5aec0ff207e9427b8756471eb003fd68859f67b1.tar.xz |
Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring with other monitoring code from OpenSim.Framework
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
3 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 3de7f9c..f57ea76 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -45,6 +45,7 @@ using OpenMetaverse.StructuredData; | |||
45 | using CoolHTTPListener = HttpServer.HttpListener; | 45 | using CoolHTTPListener = HttpServer.HttpListener; |
46 | using HttpListener=System.Net.HttpListener; | 46 | using HttpListener=System.Net.HttpListener; |
47 | using LogPrio=HttpServer.LogPrio; | 47 | using LogPrio=HttpServer.LogPrio; |
48 | using OpenSim.Framework.Monitoring; | ||
48 | 49 | ||
49 | namespace OpenSim.Framework.Servers.HttpServer | 50 | namespace OpenSim.Framework.Servers.HttpServer |
50 | { | 51 | { |
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index 3252251..8d50151 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
@@ -32,6 +32,7 @@ using System.Reflection; | |||
32 | using log4net; | 32 | using log4net; |
33 | using HttpServer; | 33 | using HttpServer; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Monitoring; | ||
35 | 36 | ||
36 | namespace OpenSim.Framework.Servers.HttpServer | 37 | namespace OpenSim.Framework.Servers.HttpServer |
37 | { | 38 | { |
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs index 35a8dee..5adbcd1 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||
@@ -34,6 +34,7 @@ using HttpServer; | |||
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using System.Reflection; | 35 | using System.Reflection; |
36 | using log4net; | 36 | using log4net; |
37 | using OpenSim.Framework.Monitoring; | ||
37 | 38 | ||
38 | namespace OpenSim.Framework.Servers.HttpServer | 39 | namespace OpenSim.Framework.Servers.HttpServer |
39 | { | 40 | { |