* minor: log message twiddling

0.6.0-stable
Justin Clarke Casey 2008-08-01 20:05:26 +00:00
parent 10e0df0a2d
commit 5350cec0b3
6 changed files with 17 additions and 24 deletions

View File

@ -365,6 +365,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public LLClientView(EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer, public LLClientView(EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer,
AgentCircuitManager authenSessions, LLUUID agentId, LLUUID sessionId, uint circuitCode, EndPoint proxyEP) AgentCircuitManager authenSessions, LLUUID agentId, LLUUID sessionId, uint circuitCode, EndPoint proxyEP)
{ {
m_log.Info("[CLIENT]: Started up new client thread to handle incoming request");
m_moneyBalance = 1000; m_moneyBalance = 1000;
m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion()); m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion());
@ -378,8 +380,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// m_inventoryCache = inventoryCache; // m_inventoryCache = inventoryCache;
m_authenticateSessionsHandler = authenSessions; m_authenticateSessionsHandler = authenSessions;
m_log.Info("[CLIENT]: Started up new client thread to handle incoming request");
m_agentId = agentId; m_agentId = agentId;
m_sessionId = sessionId; m_sessionId = sessionId;
m_circuitCode = circuitCode; m_circuitCode = circuitCode;
@ -399,7 +399,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
RegisterLocalPacketHandlers(); RegisterLocalPacketHandlers();
m_clientThread = new Thread(new ThreadStart(AuthUser)); m_clientThread = new Thread(new ThreadStart(AuthUser));
m_clientThread.Name = "ClientThread"; m_clientThread.Name = "ClientThread";
m_clientThread.IsBackground = true; m_clientThread.IsBackground = true;
@ -678,7 +677,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity); m_clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity);
m_clientPingTimer.Enabled = true; m_clientPingTimer.Enabled = true;
m_log.Info("[CLIENT]: Adding viewer agent to scene");
m_scene.AddNewClient(this, true); m_scene.AddNewClient(this, true);
} }

View File

@ -382,6 +382,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
if (!(packet is UseCircuitCodePacket)) if (!(packet is UseCircuitCodePacket))
return; return;
UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet;
lock (clientCircuits) lock (clientCircuits)
{ {

View File

@ -289,15 +289,11 @@ namespace OpenSim.Region.Communications.OGS1
if (respData == null || !respData.ContainsKey("returnString")) if (respData == null || !respData.ContainsKey("returnString"))
{ {
m_log.Warn("[OSG1 USER SERVICES]: Error updating user record, Grid server may not be updated."); m_log.Error("[OSG1 USER SERVICES]: Error updating user record, Grid server may not be updated.");
} }
else else
{ {
if ((string) respData["returnString"] == "TRUE") if ((string) respData["returnString"] != "TRUE")
{
m_log.Info("[OSG1 USER SERVICES]: Successfully updated user record");
}
else
{ {
m_log.Error("[OSG1 USER SERVICES]: Error updating user record"); m_log.Error("[OSG1 USER SERVICES]: Error updating user record");
} }

View File

@ -559,14 +559,10 @@ namespace OpenSim.Region.Environment.Scenes
if (child) if (child)
{ {
m_numChildAgents++; m_numChildAgents++;
m_log.Info("[SCENE]" + m_regInfo.RegionName + ": Creating new child agent.");
} }
else else
{ {
m_numRootAgents++; m_numRootAgents++;
m_log.Info("[SCENE] " + m_regInfo.RegionName + ": Creating new root agent.");
m_log.Info("[SCENE] " + m_regInfo.RegionName + ": Adding Physical agent.");
presence.AddToPhysicalScene(); presence.AddToPhysicalScene();
} }

View File

@ -1982,16 +1982,12 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="child"></param> /// <param name="child"></param>
public override void AddNewClient(IClientAPI client, bool child) public override void AddNewClient(IClientAPI client, bool child)
{ {
m_log.DebugFormat(
"[CONNECTION DEBUGGING]: Creating new client for {0} at {1}",
client.AgentId, RegionInfo.RegionName);
SubscribeToClientEvents(client); SubscribeToClientEvents(client);
ScenePresence presence; ScenePresence presence;
if (m_restorePresences.ContainsKey(client.AgentId)) if (m_restorePresences.ContainsKey(client.AgentId))
{ {
m_log.Info("[REGION]: Restoring Scene Presence"); m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName);
presence = m_restorePresences[client.AgentId]; presence = m_restorePresences[client.AgentId];
m_restorePresences.Remove(client.AgentId); m_restorePresences.Remove(client.AgentId);
@ -2015,7 +2011,9 @@ namespace OpenSim.Region.Environment.Scenes
} }
else else
{ {
m_log.Info("[REGION]: Adding New Scene Presence"); m_log.DebugFormat(
"[SCENE]: Adding new {0} agent {1} {2} in {3}",
(child ? "child" : "root"), client.Name, client.AgentId, RegionInfo.RegionName);
CommsManager.UserProfileCacheService.AddNewUser(client); CommsManager.UserProfileCacheService.AddNewUser(client);
@ -2263,6 +2261,10 @@ namespace OpenSim.Region.Environment.Scenes
} }
try try
{ {
m_log.DebugFormat(
"[SCENE]: Removing {0} agent {1} from region {2}",
(childagentYN ? "child" : "root"), agentID, RegionInfo.RegionName);
if (avatar.IsChildAgent) if (avatar.IsChildAgent)
{ {
m_innerScene.removeUserCount(false); m_innerScene.removeUserCount(false);

View File

@ -654,7 +654,7 @@ namespace OpenSim.Region.Environment.Scenes
m_animations.Clear(); m_animations.Clear();
// m_log.DebugFormat( // m_log.DebugFormat(
// "[SCENEPRESENCE]: Downgrading child agent {0}, {1} to a root agent in {2}", // "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
// Name, UUID, m_scene.RegionInfo.RegionName); // Name, UUID, m_scene.RegionInfo.RegionName);
Velocity = new LLVector3(0, 0, 0); Velocity = new LLVector3(0, 0, 0);