OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Start long-lived thread in IRCConnector via watchdog rather than indepedently, so that it can be seen in "show threads" and stats

0.8-extended
Justin Clark-Casey (justincc) 2014-09-04 00:00:51 +01:00 committed by Justin Clark-Casey
parent badeefdf99
commit cbf4106987
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
View File

@ -109,10 +109,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
internal int m_resetk = 0; internal int m_resetk = 0;
// Working threads
private Thread m_listener = null;
private Object msyncConnect = new Object(); private Object msyncConnect = new Object();
internal bool m_randomizeNick = true; // add random suffix internal bool m_randomizeNick = true; // add random suffix
@ -363,10 +359,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
m_log.InfoFormat("[IRC-Connector-{0}]: Connected to {1}:{2}", idn, m_server, m_port); m_log.InfoFormat("[IRC-Connector-{0}]: Connected to {1}:{2}", idn, m_server, m_port);
m_listener = new Thread(new ThreadStart(ListenerRun)); Watchdog.StartThread(ListenerRun, "IRCConnectionListenerThread", ThreadPriority.Normal, true, false);
m_listener.Name = "IRCConnectorListenerThread";
m_listener.IsBackground = true;
m_listener.Start();
// This is the message order recommended by RFC 2812 // This is the message order recommended by RFC 2812
if (m_password != null) if (m_password != null)
@ -510,21 +503,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
{ {
while (m_enabled && m_connected) while (m_enabled && m_connected)
{ {
if ((inputLine = m_reader.ReadLine()) == null) if ((inputLine = m_reader.ReadLine()) == null)
throw new Exception("Listener input socket closed"); throw new Exception("Listener input socket closed");
Watchdog.UpdateThread();
// m_log.Info("[IRCConnector]: " + inputLine); // m_log.Info("[IRCConnector]: " + inputLine);
if (inputLine.Contains("PRIVMSG")) if (inputLine.Contains("PRIVMSG"))
{ {
Dictionary<string, string> data = ExtractMsg(inputLine); Dictionary<string, string> data = ExtractMsg(inputLine);
// Any chat ??? // Any chat ???
if (data != null) if (data != null)
{ {
OSChatMessage c = new OSChatMessage(); OSChatMessage c = new OSChatMessage();
c.Message = data["msg"]; c.Message = data["msg"];
c.Type = ChatTypeEnum.Region; c.Type = ChatTypeEnum.Region;
@ -540,9 +532,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
c.Message = String.Format("/me {0}", c.Message.Substring(8, c.Message.Length - 9)); c.Message = String.Format("/me {0}", c.Message.Substring(8, c.Message.Length - 9));
ChannelState.OSChat(this, c, false); ChannelState.OSChat(this, c, false);
} }
} }
else else
{ {
@ -562,6 +552,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
if (m_enabled && (m_resetk == resetk)) if (m_enabled && (m_resetk == resetk))
Reconnect(); Reconnect();
Watchdog.RemoveThread();
} }
private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)", private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)",