From 09dabb2aec0ebfd4bc53a18affe091b25f4ba041 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 4 Nov 2008 21:26:40 +0000
Subject: * Prevent texture sender thread termination from immediately crashing
the sim
---
.../Agent/TextureDownload/TextureDownloadModule.cs | 46 +++++++++++++---------
.../Modules/Avatar/Chat/IRCConnector.cs | 2 -
2 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
index aa4d070..af51df6 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
@@ -39,8 +39,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
{
public class TextureDownloadModule : IRegionModule
{
- //private static readonly log4net.ILog m_log
- // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+ private static readonly log4net.ILog m_log
+ = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// There is one queue for all textures waiting to be sent, regardless of the requesting user.
@@ -176,34 +176,44 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
{
ITextureSender sender = null;
- while (true)
+ try
{
- sender = m_queueSenders.Dequeue();
-
- if (sender.Cancel)
+ while (true)
{
- TextureSent(sender);
+ sender = m_queueSenders.Dequeue();
- sender.Cancel = false;
- }
- else
- {
- bool finished = sender.SendTexturePacket();
- if (finished)
+ if (sender.Cancel)
{
TextureSent(sender);
+
+ sender.Cancel = false;
}
else
{
- m_queueSenders.Enqueue(sender);
+ bool finished = sender.SendTexturePacket();
+ if (finished)
+ {
+ TextureSent(sender);
+ }
+ else
+ {
+ m_queueSenders.Enqueue(sender);
+ }
}
- }
- // Make sure that any sender we currently have can get garbage collected
- sender = null;
+ // Make sure that any sender we currently have can get garbage collected
+ sender = null;
- //m_log.InfoFormat("[TEXTURE] Texture sender queue size: {0}", m_queueSenders.Count());
+ //m_log.InfoFormat("[TEXTURE] Texture sender queue size: {0}", m_queueSenders.Count());
+ }
}
+ catch (Exception e)
+ {
+ // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened
+ m_log.ErrorFormat(
+ "[TEXTURE]: Texture send thread terminating with exception. PLEASE REBOOT YOUR SIM - TEXTURES WILL NOT BE AVAILABLE UNTIL YOU DO. Exception is {0}",
+ e);
+ }
}
/// <summary>
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
index b9422f3..3ebb226 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
@@ -371,7 +371,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
public void Reconnect()
{
-
m_log.DebugFormat("[IRC-Connector-{0}]: Reconnect request for {1} on {2}:{3}", idn, m_nick, m_server, m_ircChannel);
// Don't do this if a Connect is in progress...
@@ -518,7 +517,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
}
if (m_enabled) Reconnect();
-
}
private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)",
--
cgit v1.1