diff options
author | Justin Clarke Casey | 2008-05-03 19:12:17 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-03 19:12:17 +0000 |
commit | 45a71bb045b710a4d59c05f87936da5ca03eb9b2 (patch) | |
tree | dfde31c9df1fe2432df21067f764fd09ca5ee539 /OpenSim/Framework | |
parent | * Refactor: Move bulk of CreateFolder from UserProfileCacheService into Cache... (diff) | |
download | opensim-SC-45a71bb045b710a4d59c05f87936da5ca03eb9b2.zip opensim-SC-45a71bb045b710a4d59c05f87936da5ca03eb9b2.tar.gz opensim-SC-45a71bb045b710a4d59c05f87936da5ca03eb9b2.tar.bz2 opensim-SC-45a71bb045b710a4d59c05f87936da5ca03eb9b2.tar.xz |
* Make user profile cache service complain if the caller assumes a profile exists when in fact it does not
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 55 |
1 files changed, 42 insertions, 13 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index f1929c8..71da8dc 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -107,7 +107,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
107 | } | 107 | } |
108 | else | 108 | else |
109 | { | 109 | { |
110 | m_log.WarnFormat("[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userID); | 110 | m_log.ErrorFormat("[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userID); |
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||
@@ -133,7 +133,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
133 | } | 133 | } |
134 | 134 | ||
135 | /// <summary> | 135 | /// <summary> |
136 | /// Get the details of the given user. | 136 | /// Get the details of the given user. A caller should try this method first if it isn't sure that |
137 | /// a user profile exists for the given user. | ||
137 | /// </summary> | 138 | /// </summary> |
138 | /// <param name="userID"></param> | 139 | /// <param name="userID"></param> |
139 | /// <returns>null if no user details are found</returns> | 140 | /// <returns>null if no user details are found</returns> |
@@ -162,11 +163,17 @@ namespace OpenSim.Framework.Communications.Cache | |||
162 | { | 163 | { |
163 | if (!userProfile.CreateFolder(folderName, folderID, folderType, parentID)) | 164 | if (!userProfile.CreateFolder(folderName, folderID, folderType, parentID)) |
164 | { | 165 | { |
165 | m_log.WarnFormat( | 166 | m_log.ErrorFormat( |
166 | "[AGENT INVENTORY]: Failed to create folder for user {0} {1}", | 167 | "[AGENT INVENTORY]: Failed to create folder for user {0} {1}", |
167 | remoteClient.Name, remoteClient.AgentId); | 168 | remoteClient.Name, remoteClient.AgentId); |
168 | } | 169 | } |
169 | } | 170 | } |
171 | else | ||
172 | { | ||
173 | m_log.ErrorFormat( | ||
174 | "[AGENT INVENTORY]: Could not find user profile for {0} {1}", | ||
175 | remoteClient.Name, remoteClient.AgentId); | ||
176 | } | ||
170 | } | 177 | } |
171 | 178 | ||
172 | /// <summary> | 179 | /// <summary> |
@@ -211,6 +218,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
211 | new object[] { remoteClient, folderID, type, name, parentID })); | 218 | new object[] { remoteClient, folderID, type, name, parentID })); |
212 | } | 219 | } |
213 | } | 220 | } |
221 | else | ||
222 | { | ||
223 | m_log.ErrorFormat( | ||
224 | "[AGENT INVENTORY]: Could not find user profile for {0} {1}", | ||
225 | remoteClient.Name, remoteClient.AgentId); | ||
226 | } | ||
214 | } | 227 | } |
215 | 228 | ||
216 | /// <summary> | 229 | /// <summary> |
@@ -246,6 +259,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
246 | new object[] { remoteClient, folderID, parentID })); | 259 | new object[] { remoteClient, folderID, parentID })); |
247 | } | 260 | } |
248 | } | 261 | } |
262 | else | ||
263 | { | ||
264 | m_log.ErrorFormat( | ||
265 | "[AGENT INVENTORY]: Could not find user profile for {0} {1}", | ||
266 | remoteClient.Name, remoteClient.AgentId); | ||
267 | } | ||
249 | } | 268 | } |
250 | 269 | ||
251 | /// <summary> | 270 | /// <summary> |
@@ -337,7 +356,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
337 | } | 356 | } |
338 | else | 357 | else |
339 | { | 358 | { |
340 | m_log.ErrorFormat("[INVENTORY CACHE]: Could not find root folder for user {0}", remoteClient.Name); | 359 | m_log.ErrorFormat("[AGENT INVENTORY]: Could not find root folder for user {0}", remoteClient.Name); |
341 | 360 | ||
342 | return; | 361 | return; |
343 | } | 362 | } |
@@ -345,15 +364,15 @@ namespace OpenSim.Framework.Communications.Cache | |||
345 | else | 364 | else |
346 | { | 365 | { |
347 | m_log.ErrorFormat( | 366 | m_log.ErrorFormat( |
348 | "[USER CACHE]: HandleFetchInventoryDescendents() could not find user profile {0}, {1}", | 367 | "[AGENT INVENTORY]: Could not find user profile for {0} {1}", |
349 | remoteClient.Name, remoteClient.AgentId); | 368 | remoteClient.Name, remoteClient.AgentId); |
350 | 369 | ||
351 | return; | 370 | return; |
352 | } | 371 | } |
353 | 372 | ||
354 | // If we've reached this point then we couldn't find the folder, even though the client thinks | 373 | // If we've reached this point then we couldn't find the folder, even though the client thinks |
355 | // it exists | 374 | // it exists |
356 | m_log.ErrorFormat("[INVENTORY CACHE]: Could not find folder {0} for user {1}", | 375 | m_log.ErrorFormat("[AGENT INVENTORY]: Could not find folder {0} for user {1}", |
357 | folderID, remoteClient.Name); | 376 | folderID, remoteClient.Name); |
358 | } | 377 | } |
359 | 378 | ||
@@ -431,23 +450,21 @@ namespace OpenSim.Framework.Communications.Cache | |||
431 | } | 450 | } |
432 | else | 451 | else |
433 | { | 452 | { |
434 | m_log.ErrorFormat("[INVENTORY CACHE]: Could not find root folder for user {0}", agentID.ToString()); | 453 | m_log.ErrorFormat("[INVENTORY CACHE]: Could not find root folder for user {0}", agentID); |
435 | 454 | ||
436 | return null; | 455 | return null; |
437 | } | 456 | } |
438 | } | 457 | } |
439 | else | 458 | else |
440 | { | 459 | { |
441 | m_log.ErrorFormat( | 460 | m_log.ErrorFormat("[AGENT INVENTORY]: Could not find user profile for {0}", agentID); |
442 | "[USER CACHE]: HandleFetchInventoryDescendentsCAPS() Could not find user profile for {0}", | ||
443 | agentID); | ||
444 | 461 | ||
445 | return null; | 462 | return null; |
446 | } | 463 | } |
447 | 464 | ||
448 | // If we've reached this point then we couldn't find the folder, even though the client thinks | 465 | // If we've reached this point then we couldn't find the folder, even though the client thinks |
449 | // it exists | 466 | // it exists |
450 | m_log.ErrorFormat("[INVENTORY CACHE]: " + | 467 | m_log.ErrorFormat("[AGENT INVENTORY]: " + |
451 | "Could not find folder {0} for user {1}", | 468 | "Could not find folder {0} for user {1}", |
452 | folderID, agentID.ToString()); | 469 | folderID, agentID.ToString()); |
453 | 470 | ||
@@ -494,6 +511,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
494 | new object[] { remoteClient, folderID })); | 511 | new object[] { remoteClient, folderID })); |
495 | } | 512 | } |
496 | } | 513 | } |
514 | else | ||
515 | { | ||
516 | m_log.ErrorFormat( | ||
517 | "[AGENT INVENTORY]: Could not find user profile for {0} {1}", | ||
518 | remoteClient.Name, remoteClient.AgentId); | ||
519 | } | ||
497 | } | 520 | } |
498 | 521 | ||
499 | public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) | 522 | public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) |
@@ -517,6 +540,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
517 | } | 540 | } |
518 | } | 541 | } |
519 | } | 542 | } |
543 | else | ||
544 | { | ||
545 | m_log.ErrorFormat( | ||
546 | "[AGENT INVENTORY]: Could not find user profile for {0} {1}", | ||
547 | remoteClient.Name, remoteClient.AgentId); | ||
548 | } | ||
520 | } | 549 | } |
521 | } | 550 | } |
522 | } | 551 | } |