From 6ae1b80d20cbcb850a715bd6b452b0eb575a1291 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Wed, 14 Jan 2009 17:34:04 +0000
Subject: [PATCH] * Do some log tweaking to better see incoming connection
 success (and failure)

---
 .../ClientStack/LindenUDP/LLUDPServer.cs      | 16 ++++++----------
 OpenSim/Region/Environment/Scenes/Scene.cs    | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index a90c3805f4..18b5acf3bc 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -416,24 +416,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (!m_packetServer.IsClientAuthorized(useCircuit, m_circuitManager, out sessionInfo))
                 {
                     m_log.WarnFormat(
-                        "[CLIENT]: New user request denied to avatar {0} connecting with unauthorized circuit code {1} from {2}",
+                        "[CONNECTION FAILURE]: Connection request for client {0} connecting with unnotified circuit code {1} from {2}",
                         useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, epSender);
                     
                     return;
                 }
-                else
-                {
-                    m_log.Debug("[CLIENT]: Got authenticated connection from " + epSender);
-                }
                 
                 lock (clientCircuits)
                 {
                     if (!clientCircuits.ContainsKey(epSender))
-                    {
-                        m_log.DebugFormat(
-                            "[CLIENT]: Adding new circuit for agent {0}, circuit code {1}", 
-                            useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);
-                        
+                    {                        
                         clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);                        
                         isNewCircuit = true;
                     }
@@ -451,6 +443,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     
                     m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy);
                 }
+                
+                m_log.DebugFormat(
+                    "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated", 
+                    useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);                
             }            
             
             // Ack the UseCircuitCode packet
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index bbc62320d2..11655e9042 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2294,7 +2294,7 @@ namespace OpenSim.Region.Environment.Scenes
             else
             {
                 m_log.DebugFormat(
-                    "[SCENE]: Adding new child agent {0} for new user connection in {1}",
+                    "[SCENE]: Adding new child agent for {0} in {1}",
                     client.Name, RegionInfo.RegionName);
 
                 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
@@ -2759,10 +2759,15 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="agent"></param>
         public void NewUserConnection(AgentCircuitData agent)
         {
+            // Don't disable this log messages - it's too useful
+            m_log.DebugFormat(
+                "[CONNECTION SETUP]: 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 DEBUGGING]: Denied access to: {0} at {1} because the user is on the region banlist",
+               "[CONNECTION SETUP]: Denied access to: {0} at {1} because the user is on the region banlist",
                agent.AgentID, RegionInfo.RegionName);
             }
 
@@ -2773,21 +2778,18 @@ namespace OpenSim.Region.Environment.Scenes
             ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
             if (sp != null)
             {
-                m_log.DebugFormat("[CONNECTION DEBUGGING]: Updated agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
+                m_log.DebugFormat(
+                    "[CONNECTION SETUP]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
                 sp.AdjustKnownSeeds();
                 sp.AbsolutePosition = agent.startpos;
                 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
                 return;
             }
 
-            m_log.DebugFormat("[CONNECTION DEBUGGING]: Adding NewUserConnection for {0} in {1} with CC of {2}, pos={3}", agent.AgentID,
-                              RegionInfo.RegionName, agent.circuitcode, agent.startpos.ToString());
-
             AddCapsHandler(agent.AgentID);
 
             if (!agent.child)
             {
-
                 // Honor parcel landing type and position.
                 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
                 if (land != null)
@@ -2810,7 +2812,8 @@ namespace OpenSim.Region.Environment.Scenes
             }
             else
             {
-                m_log.WarnFormat("[USERINFO CACHE]: 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);
+                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);
             }
         }