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

* Adding console spam to help track 'The Steve Bug'.

ThreadPoolClientBranch
Adam Frisby 2008-02-08 17:49:53 +00:00
parent 62943de68a
commit a637473f80
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -456,7 +456,7 @@ namespace OpenSim.Region.Communications.OGS1
/// <returns></returns>
public XmlRpcResponse ExpectUser(XmlRpcRequest request)
{
Console.WriteLine("Expecting User...");
m_log.Debug("[CONNECTION DEBUGGING]: Expect User called, starting agent setup ... ");
Hashtable requestData = (Hashtable) request.Params[0];
AgentCircuitData agentData = new AgentCircuitData();
agentData.SessionID = new LLUUID((string) requestData["session_id"]);
@ -469,10 +469,12 @@ namespace OpenSim.Region.Communications.OGS1
if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
{
m_log.Debug("[CONNECTION DEBUGGING]: Child agent detected");
agentData.child = true;
}
else
{
m_log.Debug("[CONNECTION DEBUGGING]: Main agent detected");
agentData.startpos =
new LLVector3(Convert.ToUInt32(requestData["startpos_x"]),
Convert.ToUInt32(requestData["startpos_y"]),
@ -482,6 +484,7 @@ namespace OpenSim.Region.Communications.OGS1
ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]);
m_log.Debug("[CONNECTION DEBUGGING]: Triggering welcome for " + agentData.AgentID.ToString() + " into " + regionHandle.ToString());
m_localBackend.TriggerExpectUser(regionHandle, agentData);
m_log.Info("[GRID]: Welcoming new user...");

18
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1241,6 +1241,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="child"></param>
public override void AddNewClient(IClientAPI client, bool child)
{
m_log.Warn("[CONNECTION DEBUGGING]: Creating new client for " + client.AgentId.ToString());
SubscribeToClientEvents(client);
m_estateManager.sendRegionHandshake(client);
@ -1516,6 +1517,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (agent.CapsPath != String.Empty)
{
m_log.Debug("[CONNECTION DEBUGGING]: Setting up CAPS handler for " + agent.AgentID.ToString() + " at " + agent.CapsPath.ToString());
Caps cap =
new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port,
agent.CapsPath, agent.AgentID, m_dumpAssetsToFile);
@ -1526,7 +1528,7 @@ namespace OpenSim.Region.Environment.Scenes
cap.RegisterHandlers();
if (agent.child)
{
}
cap.AddNewInventoryItem = AddInventoryItem;
cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset;
@ -1534,14 +1536,14 @@ namespace OpenSim.Region.Environment.Scenes
if (m_capsHandlers.ContainsKey(agent.AgentID))
{
//m_log.Warn("[client]: Adding duplicate CAPS entry for user " +
// agent.AgentID.ToString());
m_log.Debug("[CONNECTION DEBUGGING]: Caps path already in use for " + agent.AgentID.ToString());
try
{
m_capsHandlers[agent.AgentID] = cap;
}
catch (KeyNotFoundException)
{
m_log.Debug("[CONNECTION DEBUGGING]: Caught exception adding handler for " + agent.AgentID.ToString());
// Fix for a potential race condition.
m_capsHandlers.Add(agent.AgentID, cap);
}
@ -1551,9 +1553,17 @@ namespace OpenSim.Region.Environment.Scenes
m_capsHandlers.Add(agent.AgentID, cap);
}
}
m_log.Debug("[client]: Creating agent circuit");
else
{
m_log.Warn("[CONNECTION DEBUGGING]: Skipped setting up CAPS handler for " + agent.AgentID.ToString());
}
m_log.Debug("[CONNECTION DEBUGGING]: Creating new circuit code (" + agent.circuitcode.ToString() + ") for " + agent.AgentID.ToString());
m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
}
else
{
m_log.Warn("[CONNECTION DEBUGGING]: Skipping this region for welcoming " + agent.AgentID.ToString() + " [" + regionHandle.ToString() + "]");
}
}
/// <summary>