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

* minor: Change around more debugging messages

0.6.2-post-fixes
Justin Clarke Casey 2009-01-14 18:46:33 +00:00
parent 6ae1b80d20
commit 75ea84f3d2
7 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -445,8 +445,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
m_log.DebugFormat( m_log.DebugFormat(
"[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated", "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}",
useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);
} }
// Ack the UseCircuitCode packet // Ack the UseCircuitCode packet

2
OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
View File

@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
if (m_rootAgents[avatar.UUID] == avatar.Scene.RegionInfo.originRegionID) if (m_rootAgents[avatar.UUID] == avatar.Scene.RegionInfo.originRegionID)
{ {
m_rootAgents.Remove(avatar.UUID); m_rootAgents.Remove(avatar.UUID);
m_log.Info("[MONEY]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent"); // m_log.Debug("[MONEY]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent");
} }
} }
} }

2
OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
View File

@ -329,7 +329,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
if (m_rootAgents[avatar.UUID] == avatar.RegionHandle) if (m_rootAgents[avatar.UUID] == avatar.RegionHandle)
{ {
m_rootAgents.Remove(avatar.UUID); m_rootAgents.Remove(avatar.UUID);
m_log.Debug("[FRIEND]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent"); // m_log.Debug("[FRIEND]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent");
} }
} }
} }

4
OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
View File

@ -338,7 +338,9 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
if (avatar.Scene.NeedSceneCacheClear(avatar.UUID) || isHyperLink) if (avatar.Scene.NeedSceneCacheClear(avatar.UUID) || isHyperLink)
{ {
m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID); m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
m_log.InfoFormat("[HGSceneCommService]: User {0} is going to another region, profile cache removed", avatar.UUID); m_log.DebugFormat(
"[HGSceneCommService]: User {0} is going to another region, profile cache removed",
avatar.UUID);
} }
} }
else else

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

@ -2759,15 +2759,15 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="agent"></param> /// <param name="agent"></param>
public void NewUserConnection(AgentCircuitData agent) public void NewUserConnection(AgentCircuitData agent)
{ {
// Don't disable this log messages - it's too useful // Don't disable this log message - it's too helpful
m_log.DebugFormat( m_log.DebugFormat(
"[CONNECTION SETUP]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})", "[CONNECTION BEGIN]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})",
RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode); RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
{ {
m_log.WarnFormat( m_log.WarnFormat(
"[CONNECTION SETUP]: Denied access to: {0} at {1} because the user is on the region banlist", "[CONNECTION BEGIN]: Denied access to: {0} at {1} because the user is on the region banlist",
agent.AgentID, RegionInfo.RegionName); agent.AgentID, RegionInfo.RegionName);
} }
@ -2778,11 +2778,22 @@ namespace OpenSim.Region.Environment.Scenes
ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID); ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
if (sp != null) if (sp != null)
{ {
m_log.DebugFormat( if (sp.IsChildAgent)
"[CONNECTION SETUP]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName); m_log.DebugFormat(
"[CONNECTION BEGIN]: Incoming client for {0} is existing child agent {1}",
RegionInfo.RegionName, agent.AgentID);
else
m_log.DebugFormat(
"[CONNECTION BEGIN]: Incoming client for {0} is existing root agent {1}",
RegionInfo.RegionName, agent.AgentID);
// m_log.DebugFormat(
// "[CONNECTION BEGIN]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
sp.AdjustKnownSeeds(); sp.AdjustKnownSeeds();
sp.AbsolutePosition = agent.startpos; sp.AbsolutePosition = agent.startpos;
m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
return; return;
} }
@ -2813,7 +2824,7 @@ namespace OpenSim.Region.Environment.Scenes
else else
{ {
m_log.WarnFormat( m_log.WarnFormat(
"[CONNECTION SETUP]: We couldn't find a User Info record for {0}. This is usually an indication that the UUID we're looking up is invalid", agent.AgentID); "[CONNECTION BEGIN]: We couldn't find a User Info record for {0}. This is usually an indication that the UUID we're looking up is invalid", agent.AgentID);
} }
} }

6
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -916,10 +916,10 @@ namespace OpenSim.Region.Environment.Scenes
if (avatar.Scene.NeedSceneCacheClear(avatar.UUID)) if (avatar.Scene.NeedSceneCacheClear(avatar.UUID))
{ {
m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID); m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
m_log.InfoFormat("User {0} is going to another region, profile cache removed", avatar.UUID); m_log.DebugFormat(
"[SCENE COMMUNICATION SERVICE]: User {0} is going to another region, profile cache removed",
avatar.UUID);
} }
} }
else else
{ {

11
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -2483,7 +2483,8 @@ namespace OpenSim.Region.Environment.Scenes
if (m_scene.NeedSceneCacheClear(UUID)) if (m_scene.NeedSceneCacheClear(UUID))
{ {
m_scene.CommsManager.UserProfileCacheService.RemoveUser(UUID); m_scene.CommsManager.UserProfileCacheService.RemoveUser(UUID);
m_log.InfoFormat("[AVATAR]: User {0} is going to another region, profile cache removed", UUID); m_log.DebugFormat(
"[SCENE PRESENCE]: User {0} is going to another region, profile cache removed", UUID);
} }
} }
else else
@ -2510,7 +2511,9 @@ namespace OpenSim.Region.Environment.Scenes
public void CloseChildAgents(uint newRegionX, uint newRegionY) public void CloseChildAgents(uint newRegionX, uint newRegionY)
{ {
List<ulong> byebyeRegions = new List<ulong>(); List<ulong> byebyeRegions = new List<ulong>();
m_log.DebugFormat("[AVATAR]: Closing child agents. Checking {0} regions in {1}", m_knownChildRegions.Keys.Count, Scene.RegionInfo.RegionName); m_log.DebugFormat(
"[SCENE PRESENCE]: Closing child agents. Checking {0} regions in {1}",
m_knownChildRegions.Keys.Count, Scene.RegionInfo.RegionName);
//DumpKnownRegions(); //DumpKnownRegions();
lock (m_knownChildRegions) lock (m_knownChildRegions)
@ -2534,11 +2537,13 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
} }
if (byebyeRegions.Count > 0) if (byebyeRegions.Count > 0)
{ {
m_log.Info("[AVATAR]: Closing " + byebyeRegions.Count + " child agents"); m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents");
m_scene.SceneGridService.SendCloseChildAgentConnections(m_controllingClient.AgentId, byebyeRegions); m_scene.SceneGridService.SendCloseChildAgentConnections(m_controllingClient.AgentId, byebyeRegions);
} }
foreach (ulong handle in byebyeRegions) foreach (ulong handle in byebyeRegions)
{ {
RemoveNeighbourRegion(handle); RemoveNeighbourRegion(handle);