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/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs | |
parent | Cut down on the number of packets sent during terraforming. Terraforming shou... (diff) | |
download | opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.zip opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2 opensim-SC_OLD-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/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs index d9d26aa..2606862 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs | |||
@@ -44,6 +44,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
44 | [Serializable] | 44 | [Serializable] |
45 | internal class EventQueueManager | 45 | internal class EventQueueManager |
46 | { | 46 | { |
47 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | |||
47 | /// <summary> | 49 | /// <summary> |
48 | /// List of threads processing event queue | 50 | /// List of threads processing event queue |
49 | /// </summary> | 51 | /// </summary> |
@@ -118,7 +120,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
118 | } | 120 | } |
119 | catch (Exception) | 121 | catch (Exception) |
120 | { | 122 | { |
121 | //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString()); | 123 | //myScriptEngine.m_log.Info("[ScriptEngine]: EventQueueManager Exception killing worker thread: " + e.ToString()); |
122 | } | 124 | } |
123 | } | 125 | } |
124 | } | 126 | } |
@@ -132,7 +134,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
132 | /// </summary> | 134 | /// </summary> |
133 | private void EventQueueThreadLoop() | 135 | private void EventQueueThreadLoop() |
134 | { | 136 | { |
135 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Worker thread spawned"); | 137 | //myScriptEngine.m_log.Info("[ScriptEngine]: EventQueueManager Worker thread spawned"); |
136 | try | 138 | try |
137 | { | 139 | { |
138 | QueueItemStruct BlankQIS = new QueueItemStruct(); | 140 | QueueItemStruct BlankQIS = new QueueItemStruct(); |
@@ -151,7 +153,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
151 | else | 153 | else |
152 | { | 154 | { |
153 | // Something in queue, process | 155 | // Something in queue, process |
154 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "Processing event for localID: " + QIS.localID + ", itemID: " + QIS.itemID + ", FunctionName: " + QIS.FunctionName); | 156 | //myScriptEngine.m_log.Info("[ScriptEngine]: Processing event for localID: " + QIS.localID + ", itemID: " + QIS.itemID + ", FunctionName: " + QIS.FunctionName); |
155 | 157 | ||
156 | // OBJECT BASED LOCK - TWO THREADS WORKING ON SAME OBJECT IS NOT GOOD | 158 | // OBJECT BASED LOCK - TWO THREADS WORKING ON SAME OBJECT IS NOT GOOD |
157 | lock (queueLock) | 159 | lock (queueLock) |
@@ -237,7 +239,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
237 | } // try | 239 | } // try |
238 | catch (ThreadAbortException) | 240 | catch (ThreadAbortException) |
239 | { | 241 | { |
240 | //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message); | 242 | //myScriptEngine.m_log.Info("[ScriptEngine]: EventQueueManager Worker thread killed: " + tae.Message); |
241 | } | 243 | } |
242 | } | 244 | } |
243 | 245 | ||
@@ -287,7 +289,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
287 | public void AddToObjectQueue(uint localID, string FunctionName, object[] param) | 289 | public void AddToObjectQueue(uint localID, string FunctionName, object[] param) |
288 | { | 290 | { |
289 | // Determine all scripts in Object and add to their queue | 291 | // Determine all scripts in Object and add to their queue |
290 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Adding localID: " + localID + ", FunctionName: " + FunctionName); | 292 | //myScriptEngine.m_log.Info("[ScriptEngine]: EventQueueManager Adding localID: " + localID + ", FunctionName: " + FunctionName); |
291 | 293 | ||
292 | 294 | ||
293 | // Do we have any scripts in this object at all? If not, return | 295 | // Do we have any scripts in this object at all? If not, return |