From 11ed60645abfe00493e887a1d0932cc55ad17478 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 21 Nov 2014 20:36:48 +0000 Subject: [PATCH] When logging reigon information returned by GateKeeperService.GetHyperlinkRegion, log the return server URL returned. This helps diagnoses misconfiguration where, for instance, a LAN ExternalHostName has been configured that isn't reachable externally. --- .../HypergridService/GatekeeperService.cs | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 15d3305428..9f19473920 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs @@ -206,14 +206,19 @@ namespace OpenSim.Services.HypergridService public GridRegion GetHyperlinkRegion(UUID regionID, UUID agentID, string agentHomeURI, out string message) { - m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to get hyperlink region {0} for user {1}{2}", - regionID, agentID, (agentHomeURI == null) ? "" : " @ " + agentHomeURI); - message = null; if (!m_AllowTeleportsToAnyRegion) { // Don't even check the given regionID + m_log.DebugFormat( + "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.", + m_DefaultGatewayRegion.RegionName, + m_DefaultGatewayRegion.RegionID, + m_DefaultGatewayRegion.ServerURI, + agentID, + agentHomeURI == null ? "" : " @ " + agentHomeURI); + message = "Teleporting to the default region."; return m_DefaultGatewayRegion; } @@ -222,10 +227,22 @@ namespace OpenSim.Services.HypergridService if (region == null) { + m_log.DebugFormat( + "[GATEKEEPER SERVICE]: Could not find region with ID {0} as requested by user {1}{2}. Returning null.", + regionID, agentID, (agentHomeURI == null) ? "" : " @ " + agentHomeURI); + message = "The teleport destination could not be found."; return null; } + m_log.DebugFormat( + "[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.", + region.RegionName, + region.RegionID, + region.ServerURI, + agentID, + agentHomeURI == null ? "" : " @ " + agentHomeURI); + return region; }