Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
a76a1afda8
|
@ -238,7 +238,7 @@ namespace OpenSim.Framework.Servers
|
|||
List<Thread> threads = ThreadTracker.GetThreads();
|
||||
if (threads == null)
|
||||
{
|
||||
sb.Append("Thread tracking is only enabled in DEBUG mode.");
|
||||
sb.Append("OpenSim thread tracking is only enabled in DEBUG mode.");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -264,6 +264,12 @@ namespace OpenSim.Framework.Servers
|
|||
}
|
||||
}
|
||||
}
|
||||
int workers = 0, ports = 0, maxWorkers = 0, maxPorts = 0;
|
||||
ThreadPool.GetAvailableThreads(out workers, out ports);
|
||||
ThreadPool.GetMaxThreads(out maxWorkers, out maxPorts);
|
||||
|
||||
sb.Append(Environment.NewLine + "*** ThreadPool threads ***" + Environment.NewLine);
|
||||
sb.Append("workers: " + (maxWorkers - workers) + " (" + maxWorkers + "); ports: " + (maxPorts - ports) + " (" + maxPorts + ")" + Environment.NewLine);
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
|
|
@ -67,6 +67,8 @@ namespace OpenSim.Server.Handlers.Grid
|
|||
|
||||
//m_log.DebugFormat("[XXX]: query String: {0}", body);
|
||||
|
||||
try
|
||||
{
|
||||
Dictionary<string, string> request =
|
||||
ServerUtils.ParseQueryString(body);
|
||||
|
||||
|
@ -102,8 +104,13 @@ namespace OpenSim.Server.Handlers.Grid
|
|||
return GetRegionRange(request);
|
||||
|
||||
}
|
||||
|
||||
m_log.DebugFormat("[GRID HANDLER]: unknown method {0} request {1}", method.Length, method);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.DebugFormat("[GRID HANDLER]: Exception {0}", e);
|
||||
}
|
||||
|
||||
return FailureResult();
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue