diff options
author | Justin Clark-Casey (justincc) | 2012-04-26 22:35:25 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-26 22:35:25 +0100 |
commit | cb6791fb30ce0fbe416f42d95b9737f9f30e02a7 (patch) | |
tree | c40795c9d04c91c7f05fd292b508445c92e3ff15 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-cb6791fb30ce0fbe416f42d95b9737f9f30e02a7.zip opensim-SC_OLD-cb6791fb30ce0fbe416f42d95b9737f9f30e02a7.tar.gz opensim-SC_OLD-cb6791fb30ce0fbe416f42d95b9737f9f30e02a7.tar.bz2 opensim-SC_OLD-cb6791fb30ce0fbe416f42d95b9737f9f30e02a7.tar.xz |
Tweak log messages on local region to region teleport path to help with problem resolution.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 51 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 3 |
2 files changed, 36 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index a36d0fe..0f3ed27 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -178,7 +178,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
178 | destinationRegionName = sp.Scene.RegionInfo.RegionName; | 178 | destinationRegionName = sp.Scene.RegionInfo.RegionName; |
179 | 179 | ||
180 | m_log.DebugFormat( | 180 | m_log.DebugFormat( |
181 | "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation for {0} to {1} within existing region {2}", | 181 | "[ENTITY TRANSFER MODULE]: Teleport for {0} to {1} within {2}", |
182 | sp.Name, position, destinationRegionName); | 182 | sp.Name, position, destinationRegionName); |
183 | 183 | ||
184 | // Teleport within the same region | 184 | // Teleport within the same region |
@@ -231,7 +231,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
231 | GridRegion finalDestination = GetFinalDestination(reg); | 231 | GridRegion finalDestination = GetFinalDestination(reg); |
232 | if (finalDestination == null) | 232 | if (finalDestination == null) |
233 | { | 233 | { |
234 | m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport agent."); | 234 | m_log.WarnFormat( |
235 | "[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport {0} {1}", | ||
236 | sp.Name, sp.UUID); | ||
237 | |||
235 | sp.ControllingClient.SendTeleportFailed("Problem at destination"); | 238 | sp.ControllingClient.SendTeleportFailed("Problem at destination"); |
236 | return; | 239 | return; |
237 | } | 240 | } |
@@ -320,10 +323,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
320 | } | 323 | } |
321 | 324 | ||
322 | if (IsInTransit(sp.UUID)) // Avie is already on the way. Caller shouldn't do this. | 325 | if (IsInTransit(sp.UUID)) // Avie is already on the way. Caller shouldn't do this. |
326 | { | ||
327 | m_log.DebugFormat( | ||
328 | "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2} ({3}) {4}/{5} - agent is already in transit.", | ||
329 | sp.Name, sp.UUID, reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position); | ||
330 | |||
323 | return; | 331 | return; |
332 | } | ||
324 | 333 | ||
325 | m_log.DebugFormat( | 334 | m_log.DebugFormat( |
326 | "[ENTITY TRANSFER MODULE]: Request Teleport to {0} ({1}) {2}/{3}", | 335 | "[ENTITY TRANSFER MODULE]: Teleporting {0} {1} from {2} to {3} ({4}) {5}/{6}", |
336 | sp.Name, sp.UUID, sp.Scene.RegionInfo.RegionName, | ||
327 | reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position); | 337 | reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position); |
328 | 338 | ||
329 | uint newRegionX = (uint)(reg.RegionHandle >> 40); | 339 | uint newRegionX = (uint)(reg.RegionHandle >> 40); |
@@ -444,7 +454,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
444 | capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | 454 | capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); |
445 | } | 455 | } |
446 | 456 | ||
447 | |||
448 | SetInTransit(sp.UUID); | 457 | SetInTransit(sp.UUID); |
449 | 458 | ||
450 | // Let's send a full update of the agent. This is a synchronous call. | 459 | // Let's send a full update of the agent. This is a synchronous call. |
@@ -656,7 +665,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
656 | 665 | ||
657 | public virtual void TeleportHome(UUID id, IClientAPI client) | 666 | public virtual void TeleportHome(UUID id, IClientAPI client) |
658 | { | 667 | { |
659 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName); | 668 | m_log.DebugFormat( |
669 | "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId); | ||
660 | 670 | ||
661 | //OpenSim.Services.Interfaces.PresenceInfo pinfo = m_aScene.PresenceService.GetAgent(client.SessionId); | 671 | //OpenSim.Services.Interfaces.PresenceInfo pinfo = m_aScene.PresenceService.GetAgent(client.SessionId); |
662 | GridUserInfo uinfo = m_aScene.GridUserService.GetGridUserInfo(client.AgentId.ToString()); | 672 | GridUserInfo uinfo = m_aScene.GridUserService.GetGridUserInfo(client.AgentId.ToString()); |
@@ -671,14 +681,20 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
671 | return; | 681 | return; |
672 | } | 682 | } |
673 | 683 | ||
674 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})", | 684 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})", |
675 | regionInfo.RegionName, regionInfo.RegionID, regionInfo.RegionLocX / Constants.RegionSize, regionInfo.RegionLocY / Constants.RegionSize); | 685 | client.Name, regionInfo.RegionName, regionInfo.RegionCoordX, regionInfo.RegionCoordY); |
676 | 686 | ||
677 | // a little eekie that this goes back to Scene and with a forced cast, will fix that at some point... | 687 | // a little eekie that this goes back to Scene and with a forced cast, will fix that at some point... |
678 | ((Scene)(client.Scene)).RequestTeleportLocation( | 688 | ((Scene)(client.Scene)).RequestTeleportLocation( |
679 | client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt, | 689 | client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt, |
680 | (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); | 690 | (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); |
681 | } | 691 | } |
692 | else | ||
693 | { | ||
694 | m_log.ErrorFormat( | ||
695 | "[ENTITY TRANSFER MODULE]: No grid user information found for {0} {1}. Cannot send home.", | ||
696 | client.Name, client.AgentId); | ||
697 | } | ||
682 | } | 698 | } |
683 | 699 | ||
684 | #endregion | 700 | #endregion |
@@ -1362,19 +1378,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1362 | // after a cross here | 1378 | // after a cross here |
1363 | Thread.Sleep(500); | 1379 | Thread.Sleep(500); |
1364 | 1380 | ||
1365 | Scene m_scene = sp.Scene; | 1381 | Scene scene = sp.Scene; |
1366 | 1382 | ||
1367 | uint x, y; | 1383 | m_log.DebugFormat( |
1368 | Utils.LongToUInts(reg.RegionHandle, out x, out y); | 1384 | "[ENTITY TRANSFER MODULE]: Informing {0} {1} about neighbour {2} {3} at ({4},{5})", |
1369 | x = x / Constants.RegionSize; | 1385 | sp.Name, sp.UUID, reg.RegionName, endPoint, reg.RegionCoordX, reg.RegionCoordY); |
1370 | y = y / Constants.RegionSize; | ||
1371 | m_log.Debug("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint + ")"); | ||
1372 | 1386 | ||
1373 | string capsPath = reg.ServerURI + CapsUtil.GetCapsSeedPath(a.CapsPath); | 1387 | string capsPath = reg.ServerURI + CapsUtil.GetCapsSeedPath(a.CapsPath); |
1374 | 1388 | ||
1375 | string reason = String.Empty; | 1389 | string reason = String.Empty; |
1376 | 1390 | ||
1377 | bool regionAccepted = m_scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason); | 1391 | bool regionAccepted = scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason); |
1378 | 1392 | ||
1379 | if (regionAccepted && newAgent) | 1393 | if (regionAccepted && newAgent) |
1380 | { | 1394 | { |
@@ -1391,7 +1405,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1391 | 1405 | ||
1392 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: {0} is sending {1} EnableSimulator for neighbour region {2} @ {3} " + | 1406 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: {0} is sending {1} EnableSimulator for neighbour region {2} @ {3} " + |
1393 | "and EstablishAgentCommunication with seed cap {4}", | 1407 | "and EstablishAgentCommunication with seed cap {4}", |
1394 | m_scene.RegionInfo.RegionName, sp.Name, reg.RegionName, reg.RegionHandle, capsPath); | 1408 | scene.RegionInfo.RegionName, sp.Name, reg.RegionName, reg.RegionHandle, capsPath); |
1395 | 1409 | ||
1396 | eq.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID); | 1410 | eq.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID); |
1397 | eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); | 1411 | eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); |
@@ -1402,10 +1416,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1402 | // TODO: make Event Queue disablable! | 1416 | // TODO: make Event Queue disablable! |
1403 | } | 1417 | } |
1404 | 1418 | ||
1405 | m_log.Debug("[ENTITY TRANSFER MODULE]: Completed inform client about neighbour " + endPoint.ToString()); | 1419 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Completed inform {0} {1} about neighbour {2}", sp.Name, sp.UUID, endPoint); |
1406 | } | 1420 | } |
1421 | |||
1407 | if (!regionAccepted) | 1422 | if (!regionAccepted) |
1408 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Region {0} did not accept agent: {1}", reg.RegionName, reason); | 1423 | m_log.WarnFormat( |
1424 | "[ENTITY TRANSFER MODULE]: Region {0} did not accept {1} {2}: {3}", | ||
1425 | reg.RegionName, sp.Name, sp.UUID, reason); | ||
1409 | } | 1426 | } |
1410 | 1427 | ||
1411 | /// <summary> | 1428 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 634fb43..6696997 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -201,7 +201,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
201 | 201 | ||
202 | public override void TeleportHome(UUID id, IClientAPI client) | 202 | public override void TeleportHome(UUID id, IClientAPI client) |
203 | { | 203 | { |
204 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName); | 204 | m_log.DebugFormat( |
205 | "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId); | ||
205 | 206 | ||
206 | // Let's find out if this is a foreign user or a local user | 207 | // Let's find out if this is a foreign user or a local user |
207 | IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>(); | 208 | IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>(); |