diff options
author | Justin Clark-Casey (justincc) | 2014-11-21 20:36:48 +0000 |
---|---|---|
committer | Justin Clark-Casey | 2014-11-21 20:40:59 +0000 |
commit | 5bc389ff711b74a843aaa5450e665ed01be12db6 (patch) | |
tree | fe76e64e2b332dadd328fd9c1ad03d792d93b9cf /OpenSim/Services/HypergridService/GatekeeperService.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-5bc389ff711b74a843aaa5450e665ed01be12db6.zip opensim-SC_OLD-5bc389ff711b74a843aaa5450e665ed01be12db6.tar.gz opensim-SC_OLD-5bc389ff711b74a843aaa5450e665ed01be12db6.tar.bz2 opensim-SC_OLD-5bc389ff711b74a843aaa5450e665ed01be12db6.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 15d3305..9f19473 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -206,14 +206,19 @@ namespace OpenSim.Services.HypergridService | |||
206 | 206 | ||
207 | public GridRegion GetHyperlinkRegion(UUID regionID, UUID agentID, string agentHomeURI, out string message) | 207 | public GridRegion GetHyperlinkRegion(UUID regionID, UUID agentID, string agentHomeURI, out string message) |
208 | { | 208 | { |
209 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to get hyperlink region {0} for user {1}{2}", | ||
210 | regionID, agentID, (agentHomeURI == null) ? "" : " @ " + agentHomeURI); | ||
211 | |||
212 | message = null; | 209 | message = null; |
213 | 210 | ||
214 | if (!m_AllowTeleportsToAnyRegion) | 211 | if (!m_AllowTeleportsToAnyRegion) |
215 | { | 212 | { |
216 | // Don't even check the given regionID | 213 | // Don't even check the given regionID |
214 | m_log.DebugFormat( | ||
215 | "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.", | ||
216 | m_DefaultGatewayRegion.RegionName, | ||
217 | m_DefaultGatewayRegion.RegionID, | ||
218 | m_DefaultGatewayRegion.ServerURI, | ||
219 | agentID, | ||
220 | agentHomeURI == null ? "" : " @ " + agentHomeURI); | ||
221 | |||
217 | message = "Teleporting to the default region."; | 222 | message = "Teleporting to the default region."; |
218 | return m_DefaultGatewayRegion; | 223 | return m_DefaultGatewayRegion; |
219 | } | 224 | } |
@@ -222,10 +227,22 @@ namespace OpenSim.Services.HypergridService | |||
222 | 227 | ||
223 | if (region == null) | 228 | if (region == null) |
224 | { | 229 | { |
230 | m_log.DebugFormat( | ||
231 | "[GATEKEEPER SERVICE]: Could not find region with ID {0} as requested by user {1}{2}. Returning null.", | ||
232 | regionID, agentID, (agentHomeURI == null) ? "" : " @ " + agentHomeURI); | ||
233 | |||
225 | message = "The teleport destination could not be found."; | 234 | message = "The teleport destination could not be found."; |
226 | return null; | 235 | return null; |
227 | } | 236 | } |
228 | 237 | ||
238 | m_log.DebugFormat( | ||
239 | "[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.", | ||
240 | region.RegionName, | ||
241 | region.RegionID, | ||
242 | region.ServerURI, | ||
243 | agentID, | ||
244 | agentHomeURI == null ? "" : " @ " + agentHomeURI); | ||
245 | |||
229 | return region; | 246 | return region; |
230 | } | 247 | } |
231 | 248 | ||