diff options
author | Robert Adams | 2014-01-11 22:00:24 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-11 22:00:24 -0800 |
commit | 1eea6fd452f2584d1f0948b15a02d3164b673618 (patch) | |
tree | f38c0bcb76ed8984d19e4bd240de373caaea0958 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |
parent | varregion: remove unnecessary border checking code in ScenePresence. (diff) | |
download | opensim-SC_OLD-1eea6fd452f2584d1f0948b15a02d3164b673618.zip opensim-SC_OLD-1eea6fd452f2584d1f0948b15a02d3164b673618.tar.gz opensim-SC_OLD-1eea6fd452f2584d1f0948b15a02d3164b673618.tar.bz2 opensim-SC_OLD-1eea6fd452f2584d1f0948b15a02d3164b673618.tar.xz |
varregion: Debug messages for region crossing debugging.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 277293a..3b38c71 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
@@ -48,6 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
48 | private static readonly ILog m_log = | 48 | private static readonly ILog m_log = |
49 | LogManager.GetLogger( | 49 | LogManager.GetLogger( |
50 | MethodBase.GetCurrentMethod().DeclaringType); | 50 | MethodBase.GetCurrentMethod().DeclaringType); |
51 | private static string LogHeader = "[LOCAL GRID SERVICE CONNECTOR]"; | ||
51 | 52 | ||
52 | private IGridService m_GridService; | 53 | private IGridService m_GridService; |
53 | private Dictionary<UUID, RegionCache> m_LocalCache = new Dictionary<UUID, RegionCache>(); | 54 | private Dictionary<UUID, RegionCache> m_LocalCache = new Dictionary<UUID, RegionCache>(); |
@@ -56,12 +57,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
56 | 57 | ||
57 | public LocalGridServicesConnector() | 58 | public LocalGridServicesConnector() |
58 | { | 59 | { |
59 | m_log.Debug("[LOCAL GRID SERVICE CONNECTOR]: LocalGridServicesConnector no parms."); | 60 | m_log.DebugFormat("{0} LocalGridServicesConnector no parms.", LogHeader); |
60 | } | 61 | } |
61 | 62 | ||
62 | public LocalGridServicesConnector(IConfigSource source) | 63 | public LocalGridServicesConnector(IConfigSource source) |
63 | { | 64 | { |
64 | m_log.Debug("[LOCAL GRID SERVICE CONNECTOR]: LocalGridServicesConnector instantiated directly."); | 65 | m_log.DebugFormat("{0} LocalGridServicesConnector instantiated directly.", LogHeader); |
65 | InitialiseService(source); | 66 | InitialiseService(source); |
66 | } | 67 | } |
67 | 68 | ||
@@ -197,7 +198,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
197 | // be the base coordinate of the region. | 198 | // be the base coordinate of the region. |
198 | public GridRegion GetRegionByPosition(UUID scopeID, int x, int y) | 199 | public GridRegion GetRegionByPosition(UUID scopeID, int x, int y) |
199 | { | 200 | { |
200 | m_log.DebugFormat("{0} GetRegionByPosition. pos=<{1},{2}>", "[LOCAL GRID SERVICE CONNECTOR", x, y); | ||
201 | GridRegion region = null; | 201 | GridRegion region = null; |
202 | 202 | ||
203 | // First see if it's a neighbour, even if it isn't on this sim. | 203 | // First see if it's a neighbour, even if it isn't on this sim. |
@@ -210,15 +210,25 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
210 | region = rcache.GetRegionByPosition(x, y); | 210 | region = rcache.GetRegionByPosition(x, y); |
211 | if (region != null) | 211 | if (region != null) |
212 | { | 212 | { |
213 | m_log.DebugFormat("{0} GetRegionByPosition. Found region {1}. Pos=<{2},{3}>", | 213 | // m_log.DebugFormat("{0} GetRegionByPosition. Found region {1} in cache. Pos=<{2},{3}>", |
214 | "[LOCAL GRID SERVICE CONNECTOR", region.RegionName, x, y); | 214 | // LogHeader, region.RegionName, x, y); |
215 | return region; | 215 | break; |
216 | } | 216 | } |
217 | } | 217 | } |
218 | } | 218 | } |
219 | 219 | ||
220 | // Then try on this sim (may be a lookup in DB if this is using MySql). | 220 | // Then try on this sim (may be a lookup in DB if this is using MySql). |
221 | return m_GridService.GetRegionByPosition(scopeID, x, y); | 221 | if (region == null) |
222 | { | ||
223 | region = m_GridService.GetRegionByPosition(scopeID, x, y); | ||
224 | if (region == null) | ||
225 | m_log.DebugFormat("{0} GetRegionByPosition. Region not found by grid service. Pos=<{1},{2}>", | ||
226 | LogHeader, x, y); | ||
227 | else | ||
228 | m_log.DebugFormat("{0} GetRegionByPosition. Requested region {1} from grid service. Pos=<{2},{3}>", | ||
229 | LogHeader, region.RegionName, x, y); | ||
230 | } | ||
231 | return region; | ||
222 | } | 232 | } |
223 | 233 | ||
224 | public GridRegion GetRegionByName(UUID scopeID, string regionName) | 234 | public GridRegion GetRegionByName(UUID scopeID, string regionName) |