From 2b78c40d8914bc8a5ec6430768e783bcd234b2f4 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 19 Mar 2008 19:25:10 +0000
Subject: * Adding log debugging messages and making others more explicit *
This reveals that the problem with saving scripts in a non-home region in
multi-region configurations is due to a CAPS setup issue * For some reason
the client is still using the CAPS on the region it just came from, causing
the ScenePresence lookup to fail (since the presence is now, correctly, a
child agent).
---
OpenSim/Region/Environment/Scenes/InnerScene.cs | 8 +++++-
OpenSim/Region/Environment/Scenes/Scene.cs | 37 +++++++++++++++++++------
2 files changed, 36 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Region/Environment')
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index f37d28a..1187c37 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -724,9 +724,15 @@ namespace OpenSim.Region.Environment.Scenes
{
if (!presence.IsChildAgent)
{
- avatar = presence;
+ avatar = presence;
return true;
}
+ else
+ {
+ m_log.WarnFormat(
+ "[INNER SCENE]: Requested avatar {0} could not be found in scene {1} since it is only registered as a child agent!",
+ avatarId, m_parentScene.RegionInfo.RegionName);
+ }
}
avatar = null;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 6984d8f..e036a3a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1288,7 +1288,10 @@ namespace OpenSim.Region.Environment.Scenes
///
public override void AddNewClient(IClientAPI client, bool child)
{
- m_log.Warn("[CONNECTION DEBUGGING]: Creating new client for " + client.AgentId.ToString());
+ m_log.DebugFormat(
+ "[CONNECTION DEBUGGING]: Creating new client for {0} at {1}",
+ client.AgentId, RegionInfo.RegionName);
+
SubscribeToClientEvents(client);
ScenePresence presence = null;
@@ -1637,7 +1640,8 @@ namespace OpenSim.Region.Environment.Scenes
///
- ///
+ /// Do the work necessary to initiate a new user connection.
+ /// At the moment, this consists of setting up the caps infrastructure
///
///
///
@@ -1647,7 +1651,10 @@ 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());
+ m_log.DebugFormat(
+ "[CONNECTION DEBUGGING]: Setting up CAPS handler for avatar {0} at {1} in {2}",
+ agent.AgentID, agent.CapsPath, RegionInfo.RegionName);
+
Caps cap =
new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port,
agent.CapsPath, agent.AgentID, m_dumpAssetsToFile);
@@ -1667,14 +1674,20 @@ namespace OpenSim.Region.Environment.Scenes
if (m_capsHandlers.ContainsKey(agent.AgentID))
{
- m_log.Debug("[CONNECTION DEBUGGING]: Caps path already in use for " + agent.AgentID.ToString());
+ m_log.DebugFormat(
+ "[CONNECTION DEBUGGING]: Caps path already in use for avatar {0} in region {1}",
+ agent.AgentID, RegionInfo.RegionName);
+
try
{
m_capsHandlers[agent.AgentID] = cap;
}
catch (KeyNotFoundException)
{
- m_log.Debug("[CONNECTION DEBUGGING]: Caught exception adding handler for " + agent.AgentID.ToString());
+ m_log.DebugFormat(
+ "[CONNECTION DEBUGGING]: Caught exception adding handler for avatar {0} at {1}",
+ agent.AgentID, RegionInfo.RegionName);
+
// Fix for a potential race condition.
m_capsHandlers.Add(agent.AgentID, cap);
}
@@ -1686,14 +1699,22 @@ namespace OpenSim.Region.Environment.Scenes
}
else
{
- m_log.Warn("[CONNECTION DEBUGGING]: Skipped setting up CAPS handler for " + agent.AgentID.ToString());
+ m_log.WarnFormat(
+ "[CONNECTION DEBUGGING]: Skipped setting up CAPS handler for avatar {0} at {1}",
+ agent.AgentID, RegionInfo.RegionName);
}
- m_log.Debug("[CONNECTION DEBUGGING]: Creating new circuit code (" + agent.circuitcode.ToString() + ") for " + agent.AgentID.ToString());
+
+ m_log.DebugFormat(
+ "[CONNECTION DEBUGGING]: Creating new circuit code ({0}) for avatar {1} at {2}",
+ agent.circuitcode, agent.AgentID, RegionInfo.RegionName);
+
m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
}
else
{
- m_log.Warn("[CONNECTION DEBUGGING]: Skipping this region for welcoming " + agent.AgentID.ToString() + " [" + regionHandle.ToString() + "]");
+ m_log.WarnFormat(
+ "[CONNECTION DEBUGGING]: Skipping this region for welcoming avatar {0} [{1}] at {2}",
+ agent.AgentID, regionHandle, RegionInfo.RegionName);
}
}
--
cgit v1.1