diff options
author | Jeff Ames | 2008-02-05 19:44:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-05 19:44:27 +0000 |
commit | 6ed5283bc06a62f38eb517e67b975832b603bf61 (patch) | |
tree | e5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/ClientStack/PacketQueue.cs | |
parent | Cut down on the number of packets sent during terraforming. Terraforming shou... (diff) | |
download | opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.zip opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2 opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz |
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O.
This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/PacketQueue.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/PacketQueue.cs b/OpenSim/Region/ClientStack/PacketQueue.cs index 685f91b..8b2a93a 100644 --- a/OpenSim/Region/ClientStack/PacketQueue.cs +++ b/OpenSim/Region/ClientStack/PacketQueue.cs | |||
@@ -37,6 +37,8 @@ namespace OpenSim.Region.ClientStack | |||
37 | { | 37 | { |
38 | public class PacketQueue | 38 | public class PacketQueue |
39 | { | 39 | { |
40 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
41 | |||
40 | private bool m_enabled = true; | 42 | private bool m_enabled = true; |
41 | 43 | ||
42 | private BlockingQueue<QueItem> SendQueue; | 44 | private BlockingQueue<QueItem> SendQueue; |
@@ -204,7 +206,7 @@ namespace OpenSim.Region.ClientStack | |||
204 | SendQueue.Enqueue(AssetOutgoingPacketQueue.Dequeue()); | 206 | SendQueue.Enqueue(AssetOutgoingPacketQueue.Dequeue()); |
205 | } | 207 | } |
206 | } | 208 | } |
207 | // MainLog.Instance.Verbose("THROTTLE", "Processed " + throttleLoops + " packets"); | 209 | // m_log.Info("[THROTTLE]: Processed " + throttleLoops + " packets"); |
208 | } | 210 | } |
209 | } | 211 | } |
210 | 212 | ||
@@ -253,7 +255,7 @@ namespace OpenSim.Region.ClientStack | |||
253 | lock (this) | 255 | lock (this) |
254 | { | 256 | { |
255 | ResetCounters(); | 257 | ResetCounters(); |
256 | // MainLog.Instance.Verbose("THROTTLE", "Entering Throttle"); | 258 | // m_log.Info("[THROTTLE]: Entering Throttle"); |
257 | while (TotalThrottle.UnderLimit() && PacketsWaiting() && | 259 | while (TotalThrottle.UnderLimit() && PacketsWaiting() && |
258 | (throttleLoops <= MaxThrottleLoops)) | 260 | (throttleLoops <= MaxThrottleLoops)) |
259 | { | 261 | { |
@@ -316,7 +318,7 @@ namespace OpenSim.Region.ClientStack | |||
316 | AssetThrottle.Add(qpack.Packet.ToBytes().Length); | 318 | AssetThrottle.Add(qpack.Packet.ToBytes().Length); |
317 | } | 319 | } |
318 | } | 320 | } |
319 | // MainLog.Instance.Verbose("THROTTLE", "Processed " + throttleLoops + " packets"); | 321 | // m_log.Info("[THROTTLE]: Processed " + throttleLoops + " packets"); |
320 | } | 322 | } |
321 | } | 323 | } |
322 | 324 | ||
@@ -426,7 +428,7 @@ namespace OpenSim.Region.ClientStack | |||
426 | 428 | ||
427 | tall = tResend + tLand + tWind + tCloud + tTask + tTexture + tAsset; | 429 | tall = tResend + tLand + tWind + tCloud + tTask + tTexture + tAsset; |
428 | /* | 430 | /* |
429 | MainLog.Instance.Verbose("CLIENT", "Client AgentThrottle - Got throttle:resendbytes=" + tResend + | 431 | m_log.Info("[CLIENT]: Client AgentThrottle - Got throttle:resendbytes=" + tResend + |
430 | " landbytes=" + tLand + | 432 | " landbytes=" + tLand + |
431 | " windbytes=" + tWind + | 433 | " windbytes=" + tWind + |
432 | " cloudbytes=" + tCloud + | 434 | " cloudbytes=" + tCloud + |