diff options
author | Justin Clark-Casey (justincc) | 2009-11-18 18:57:15 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-18 18:57:15 +0000 |
commit | e31e14162909556a5c646afec82adbae569e70ae (patch) | |
tree | 3e69a24aa515678cc8d4428ae0ea1530a67db164 | |
parent | minor: correct error messages when queryfolder fails (diff) | |
download | opensim-SC-e31e14162909556a5c646afec82adbae569e70ae.zip opensim-SC-e31e14162909556a5c646afec82adbae569e70ae.tar.gz opensim-SC-e31e14162909556a5c646afec82adbae569e70ae.tar.bz2 opensim-SC-e31e14162909556a5c646afec82adbae569e70ae.tar.xz |
minor: Correct some inventory corrector log messages and add more identifying detail
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs index d1d0645..f86b453 100644 --- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | |||
@@ -231,13 +231,14 @@ namespace OpenSim.Services.Connectors | |||
231 | } | 231 | } |
232 | catch (TimeoutException e) | 232 | catch (TimeoutException e) |
233 | { | 233 | { |
234 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation to {0} timed out {0} {1}.", m_ServerURI, | 234 | m_log.ErrorFormat( |
235 | e.Source, e.Message); | 235 | "[INVENTORY CONNECTOR]: GetFolderContent operation to {0} for {1} timed out {2} {3}.", |
236 | m_ServerURI, folderID, e.Source, e.Message); | ||
236 | } | 237 | } |
237 | catch (Exception e) | 238 | catch (Exception e) |
238 | { | 239 | { |
239 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed, {0} {1} (old server?).", | 240 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed for {0}, {1} {2} (old server?).", |
240 | e.Source, e.Message); | 241 | folderID, e.Source, e.Message); |
241 | } | 242 | } |
242 | 243 | ||
243 | InventoryCollection nullCollection = new InventoryCollection(); | 244 | InventoryCollection nullCollection = new InventoryCollection(); |
@@ -256,8 +257,8 @@ namespace OpenSim.Services.Connectors | |||
256 | } | 257 | } |
257 | catch (Exception e) | 258 | catch (Exception e) |
258 | { | 259 | { |
259 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory folder operation failed, {0} {1}", | 260 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory folder operation failed for {0} {1}, {2} {3}", |
260 | e.Source, e.Message); | 261 | folder.Name, folder.ID, e.Source, e.Message); |
261 | } | 262 | } |
262 | 263 | ||
263 | return false; | 264 | return false; |
@@ -272,8 +273,8 @@ namespace OpenSim.Services.Connectors | |||
272 | } | 273 | } |
273 | catch (Exception e) | 274 | catch (Exception e) |
274 | { | 275 | { |
275 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update inventory folder operation failed, {0} {1}", | 276 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update inventory folder operation failed for {0} {1}, {2} {3}", |
276 | e.Source, e.Message); | 277 | folder.Name, folder.ID, e.Source, e.Message); |
277 | } | 278 | } |
278 | 279 | ||
279 | return false; | 280 | return false; |
@@ -307,8 +308,8 @@ namespace OpenSim.Services.Connectors | |||
307 | } | 308 | } |
308 | catch (Exception e) | 309 | catch (Exception e) |
309 | { | 310 | { |
310 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory folder operation failed, {0} {1}", | 311 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory folder operation failed for {0} {1}, {2} {3}", |
311 | e.Source, e.Message); | 312 | folder.Name, folder.ID, e.Source, e.Message); |
312 | } | 313 | } |
313 | 314 | ||
314 | return false; | 315 | return false; |
@@ -323,8 +324,8 @@ namespace OpenSim.Services.Connectors | |||
323 | } | 324 | } |
324 | catch (Exception e) | 325 | catch (Exception e) |
325 | { | 326 | { |
326 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory folder operation failed, {0} {1}", | 327 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Purge inventory folder operation failed for {0} {1}, {2} {3}", |
327 | e.Source, e.Message); | 328 | folder.Name, folder.ID, e.Source, e.Message); |
328 | } | 329 | } |
329 | 330 | ||
330 | return false; | 331 | return false; |
@@ -340,8 +341,8 @@ namespace OpenSim.Services.Connectors | |||
340 | } | 341 | } |
341 | catch (Exception e) | 342 | catch (Exception e) |
342 | { | 343 | { |
343 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Get folder items operation failed, {0} {1}", | 344 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Get folder items operation failed for folder {0}, {1} {2}", |
344 | e.Source, e.Message); | 345 | folderID, e.Source, e.Message); |
345 | } | 346 | } |
346 | 347 | ||
347 | return null; | 348 | return null; |
@@ -356,8 +357,8 @@ namespace OpenSim.Services.Connectors | |||
356 | } | 357 | } |
357 | catch (Exception e) | 358 | catch (Exception e) |
358 | { | 359 | { |
359 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory item operation failed, {0} {1}", | 360 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory item operation failed for {0} {1}, {2} {3}", |
360 | e.Source, e.Message); | 361 | item.Name, item.ID, e.Source, e.Message); |
361 | } | 362 | } |
362 | 363 | ||
363 | return false; | 364 | return false; |
@@ -372,8 +373,8 @@ namespace OpenSim.Services.Connectors | |||
372 | } | 373 | } |
373 | catch (Exception e) | 374 | catch (Exception e) |
374 | { | 375 | { |
375 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update new inventory item operation failed, {0} {1}", | 376 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update new inventory item operation failed for {0} {1}, {2} {3}", |
376 | e.Source, e.Message); | 377 | item.Name, item.ID, e.Source, e.Message); |
377 | } | 378 | } |
378 | 379 | ||
379 | return false; | 380 | return false; |
@@ -443,7 +444,7 @@ namespace OpenSim.Services.Connectors | |||
443 | } | 444 | } |
444 | catch (Exception e) | 445 | catch (Exception e) |
445 | { | 446 | { |
446 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Delete inventory item operation failed, {0} {1}", | 447 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Delete inventory items operation failed, {0} {1}", |
447 | e.Source, e.Message); | 448 | e.Source, e.Message); |
448 | } | 449 | } |
449 | 450 | ||