diff options
author | Melanie | 2012-01-17 17:36:26 +0100 |
---|---|---|
committer | Melanie | 2012-01-17 17:36:26 +0100 |
commit | 08b6b3bb48fb9872fda04c06e7ba82b25c811ab6 (patch) | |
tree | 3fd4b2c8fa1ab657196cad8715a350b38dc2c57f /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
parent | Fix prim calculations so that > 32767 prims are supported (diff) | |
download | opensim-SC_OLD-08b6b3bb48fb9872fda04c06e7ba82b25c811ab6.zip opensim-SC_OLD-08b6b3bb48fb9872fda04c06e7ba82b25c811ab6.tar.gz opensim-SC_OLD-08b6b3bb48fb9872fda04c06e7ba82b25c811ab6.tar.bz2 opensim-SC_OLD-08b6b3bb48fb9872fda04c06e7ba82b25c811ab6.tar.xz |
Add some logging
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index 1af4d68..727f1c9 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using System.Timers; | ||
30 | using log4net; | 31 | using log4net; |
31 | using Nini.Config; | 32 | using Nini.Config; |
32 | using OpenMetaverse; | 33 | using OpenMetaverse; |
@@ -42,6 +43,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
42 | private static readonly ILog m_log = LogManager.GetLogger( | 43 | private static readonly ILog m_log = LogManager.GetLogger( |
43 | MethodBase.GetCurrentMethod().DeclaringType); | 44 | MethodBase.GetCurrentMethod().DeclaringType); |
44 | 45 | ||
46 | private Timer m_logTimer = new Timer(10000); | ||
47 | private List<GridInstantMessage> m_logData = new List<GridInstantMessage>(); | ||
48 | private string m_restUrl; | ||
49 | |||
45 | /// <value> | 50 | /// <value> |
46 | /// Is this module enabled? | 51 | /// Is this module enabled? |
47 | /// </value> | 52 | /// </value> |
@@ -61,9 +66,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
61 | "InstantMessageModule", "InstantMessageModule") != | 66 | "InstantMessageModule", "InstantMessageModule") != |
62 | "InstantMessageModule") | 67 | "InstantMessageModule") |
63 | return; | 68 | return; |
69 | m_restUrl = config.Configs["Messaging"].GetString("LogURL", String.Empty); | ||
64 | } | 70 | } |
65 | 71 | ||
66 | m_enabled = true; | 72 | m_enabled = true; |
73 | m_logTimer.AutoReset = false; | ||
74 | m_logTimer.Elapsed += LogTimerElapsed; | ||
67 | } | 75 | } |
68 | 76 | ||
69 | public void AddRegion(Scene scene) | 77 | public void AddRegion(Scene scene) |
@@ -148,6 +156,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
148 | { | 156 | { |
149 | byte dialog = im.dialog; | 157 | byte dialog = im.dialog; |
150 | 158 | ||
159 | if (client != null && dialog == (byte)InstantMessageDialog.MessageFromAgent) | ||
160 | LogInstantMesssage(im); | ||
161 | |||
151 | if (dialog != (byte)InstantMessageDialog.MessageFromAgent | 162 | if (dialog != (byte)InstantMessageDialog.MessageFromAgent |
152 | && dialog != (byte)InstantMessageDialog.StartTyping | 163 | && dialog != (byte)InstantMessageDialog.StartTyping |
153 | && dialog != (byte)InstantMessageDialog.StopTyping | 164 | && dialog != (byte)InstantMessageDialog.StopTyping |
@@ -226,5 +237,35 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
226 | // | 237 | // |
227 | OnInstantMessage(null, msg); | 238 | OnInstantMessage(null, msg); |
228 | } | 239 | } |
240 | |||
241 | private void LogInstantMesssage(GridInstantMessage im) | ||
242 | { | ||
243 | if (m_logData.Count < 20) | ||
244 | { | ||
245 | // Restart the log write timer | ||
246 | m_logTimer.Stop(); | ||
247 | } | ||
248 | if (!m_logTimer.Enabled) | ||
249 | m_logTimer.Start(); | ||
250 | |||
251 | lock (m_logData) | ||
252 | { | ||
253 | m_logData.Add(im); | ||
254 | } | ||
255 | } | ||
256 | |||
257 | private void LogTimerElapsed(object source, ElapsedEventArgs e) | ||
258 | { | ||
259 | lock (m_logData) | ||
260 | { | ||
261 | if (m_restUrl != String.Empty && m_logData.Count > 0) | ||
262 | { | ||
263 | bool success = SynchronousRestObjectRequester.MakeRequest<List<GridInstantMessage>, bool>("POST", m_restUrl + "/LogMessages/", m_logData); | ||
264 | if (!success) | ||
265 | m_log.ErrorFormat("[INSTANT MESSAGE]: Failed to save log data"); | ||
266 | } | ||
267 | m_logData.Clear(); | ||
268 | } | ||
269 | } | ||
229 | } | 270 | } |
230 | } | 271 | } |