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

Replace PollServiceRequestManager with older version, add extra logging to 

event exceptions to see call path leading up to it.
avinationmerge
Melanie 2012-07-17 10:21:12 +02:00
parent 130668057f
commit b35f97db46
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
View File

@ -70,7 +70,6 @@ namespace OpenSim.Framework.Servers.HttpServer
ThreadPriority.Normal, ThreadPriority.Normal,
false, false,
true, true,
null,
int.MaxValue); int.MaxValue);
} }
@ -80,7 +79,6 @@ namespace OpenSim.Framework.Servers.HttpServer
ThreadPriority.Normal, ThreadPriority.Normal,
false, false,
true, true,
null,
1000 * 60 * 10); 1000 * 60 * 10);
} }
@ -146,8 +144,9 @@ namespace OpenSim.Framework.Servers.HttpServer
foreach (object o in m_requests) foreach (object o in m_requests)
{ {
PollServiceHttpRequest req = (PollServiceHttpRequest) o; PollServiceHttpRequest req = (PollServiceHttpRequest) o;
PollServiceWorkerThread.DoHTTPGruntWork( m_server.DoHTTPGruntWork(
m_server, req, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id)); req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),
new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
} }
m_requests.Clear(); m_requests.Clear();
@ -156,7 +155,6 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
t.Abort(); t.Abort();
} }
m_running = false; m_running = false;
} }
} }
@ -186,7 +184,7 @@ namespace OpenSim.Framework.Servers.HttpServer
private bool m_running = true; private bool m_running = true;
private int slowCount = 0; private int slowCount = 0;
// private int m_timeout = 250; // increase timeout 250; now use the event one // private int m_timeout = 1000; // increase timeout 250; now use the event one
public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout) public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout)
{ {
@ -373,6 +371,7 @@ namespace OpenSim.Framework.Servers.HttpServer
else else
{ {
// if ((Environment.TickCount - req.RequestTime) > m_timeout) // if ((Environment.TickCount - req.RequestTime) > m_timeout)
if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
{ {
m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id), m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),

1
OpenSim/Region/Framework/Scenes/EventManager.cs
View File

@ -1210,6 +1210,7 @@ namespace OpenSim.Region.Framework.Scenes
m_log.ErrorFormat( m_log.ErrorFormat(
"[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing. {0} {1}", "[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing. {0} {1}",
e.Message, e.StackTrace); e.Message, e.StackTrace);
m_log.ErrorFormat(Environment.StackTrace);
} }
} }
} }