aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-09-04 00:22:30 +0100
committerJustin Clark-Casey (justincc)2014-09-04 00:22:30 +0100
commit73e20b7f5f3c6b8b45233cc04e5c6abce0d6b0a2 (patch)
tree187284da97202a7aa27be94b1fdbc51ee1bccd41
parentStart long-lived thread in IRCConnector via watchdog rather than indepedently... (diff)
downloadopensim-SC-73e20b7f5f3c6b8b45233cc04e5c6abce0d6b0a2.zip
opensim-SC-73e20b7f5f3c6b8b45233cc04e5c6abce0d6b0a2.tar.gz
opensim-SC-73e20b7f5f3c6b8b45233cc04e5c6abce0d6b0a2.tar.bz2
opensim-SC-73e20b7f5f3c6b8b45233cc04e5c6abce0d6b0a2.tar.xz
For processing outbound http requests in the XMLRPCModule, start the thread through Watchdog for monitoring and stat purposes.
-rw-r--r--OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index c6e05b1..d7ea906 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -36,6 +36,7 @@ using Nini.Config;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Monitoring;
39using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
40using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
41using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
@@ -656,12 +657,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
656 657
657 public void Process() 658 public void Process()
658 { 659 {
659 httpThread = new Thread(SendRequest);
660 httpThread.Name = "HttpRequestThread";
661 httpThread.Priority = ThreadPriority.BelowNormal;
662 httpThread.IsBackground = true;
663 _finished = false; 660 _finished = false;
664 httpThread.Start(); 661 Watchdog.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false);
665 } 662 }
666 663
667 /* 664 /*
@@ -733,6 +730,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
733 } 730 }
734 731
735 _finished = true; 732 _finished = true;
733
734 Watchdog.RemoveThread();
736 } 735 }
737 736
738 public void Stop() 737 public void Stop()