From 75ea84f3d250c8e9bc8cdf68094a7143589e3e0b Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 14 Jan 2009 18:46:33 +0000
Subject: * minor: Change around more debugging messages
---
.../Region/ClientStack/LindenUDP/LLUDPServer.cs | 4 ++--
.../Currency/SampleMoney/SampleMoneyModule.cs | 2 +-
.../Modules/Avatar/Friends/FriendsModule.cs | 2 +-
.../Hypergrid/HGSceneCommunicationService.cs | 4 +++-
OpenSim/Region/Environment/Scenes/Scene.cs | 23 ++++++++++++++++------
.../Scenes/SceneCommunicationService.cs | 6 +++---
OpenSim/Region/Environment/Scenes/ScenePresence.cs | 11 ++++++++---
7 files changed, 35 insertions(+), 17 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 18b5acf..8189501 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -445,8 +445,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
m_log.DebugFormat(
- "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated",
- useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);
+ "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}",
+ useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);
}
// Ack the UseCircuitCode packet
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 3071026..a1940ae 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
if (m_rootAgents[avatar.UUID] == avatar.Scene.RegionInfo.originRegionID)
{
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");
}
}
}
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 9efaf81..6c1c001 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -329,7 +329,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
if (m_rootAgents[avatar.UUID] == avatar.RegionHandle)
{
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");
}
}
}
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
index bb7406f..6bcc77e 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -338,7 +338,9 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
if (avatar.Scene.NeedSceneCacheClear(avatar.UUID) || isHyperLink)
{
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
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 11655e9..4ff4c0e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2759,15 +2759,15 @@ namespace OpenSim.Region.Environment.Scenes
///
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(
- "[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);
if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
{
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);
}
@@ -2778,11 +2778,22 @@ namespace OpenSim.Region.Environment.Scenes
ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
if (sp != null)
{
- m_log.DebugFormat(
- "[CONNECTION SETUP]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
+ if (sp.IsChildAgent)
+ 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.AbsolutePosition = agent.startpos;
m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+
return;
}
@@ -2813,7 +2824,7 @@ namespace OpenSim.Region.Environment.Scenes
else
{
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);
}
}
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 7997fba..ab4e7d8 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -916,10 +916,10 @@ namespace OpenSim.Region.Environment.Scenes
if (avatar.Scene.NeedSceneCacheClear(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
{
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 1a3971d..00e5548 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2483,7 +2483,8 @@ namespace OpenSim.Region.Environment.Scenes
if (m_scene.NeedSceneCacheClear(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
@@ -2510,7 +2511,9 @@ namespace OpenSim.Region.Environment.Scenes
public void CloseChildAgents(uint newRegionX, uint newRegionY)
{
List byebyeRegions = new List();
- 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();
lock (m_knownChildRegions)
@@ -2534,11 +2537,13 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
+
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);
}
+
foreach (ulong handle in byebyeRegions)
{
RemoveNeighbourRegion(handle);
--
cgit v1.1