diff options
Diffstat (limited to 'OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs index c317f4a..57c2c9f 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs | |||
@@ -38,6 +38,8 @@ namespace OpenSim.Framework.Data.MySQL | |||
38 | /// </summary> | 38 | /// </summary> |
39 | public class MySQLInventoryData : IInventoryData | 39 | public class MySQLInventoryData : IInventoryData |
40 | { | 40 | { |
41 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
42 | |||
41 | /// <summary> | 43 | /// <summary> |
42 | /// The database manager | 44 | /// The database manager |
43 | /// </summary> | 45 | /// </summary> |
@@ -104,8 +106,8 @@ namespace OpenSim.Framework.Data.MySQL | |||
104 | tableList["inventoryitems"] = null; | 106 | tableList["inventoryitems"] = null; |
105 | 107 | ||
106 | database.GetTableVersion(tableList); | 108 | database.GetTableVersion(tableList); |
107 | MainLog.Instance.Verbose("MYSQL", "Inventory Folder Version: " + tableList["inventoryfolders"]); | 109 | m_log.Info("[MYSQL]: Inventory Folder Version: " + tableList["inventoryfolders"]); |
108 | MainLog.Instance.Verbose("MYSQL", "Inventory Items Version: " + tableList["inventoryitems"]); | 110 | m_log.Info("[MYSQL]: Inventory Items Version: " + tableList["inventoryitems"]); |
109 | 111 | ||
110 | UpgradeFoldersTable(tableList["inventoryfolders"]); | 112 | UpgradeFoldersTable(tableList["inventoryfolders"]); |
111 | UpgradeItemsTable(tableList["inventoryitems"]); | 113 | UpgradeItemsTable(tableList["inventoryitems"]); |
@@ -170,7 +172,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
170 | catch (Exception e) | 172 | catch (Exception e) |
171 | { | 173 | { |
172 | database.Reconnect(); | 174 | database.Reconnect(); |
173 | MainLog.Instance.Error(e.ToString()); | 175 | m_log.Error(e.ToString()); |
174 | return null; | 176 | return null; |
175 | } | 177 | } |
176 | } | 178 | } |
@@ -208,7 +210,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
208 | catch (Exception e) | 210 | catch (Exception e) |
209 | { | 211 | { |
210 | database.Reconnect(); | 212 | database.Reconnect(); |
211 | MainLog.Instance.Error(e.ToString()); | 213 | m_log.Error(e.ToString()); |
212 | return null; | 214 | return null; |
213 | } | 215 | } |
214 | } | 216 | } |
@@ -254,7 +256,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
254 | catch (Exception e) | 256 | catch (Exception e) |
255 | { | 257 | { |
256 | database.Reconnect(); | 258 | database.Reconnect(); |
257 | MainLog.Instance.Error(e.ToString()); | 259 | m_log.Error(e.ToString()); |
258 | return null; | 260 | return null; |
259 | } | 261 | } |
260 | } | 262 | } |
@@ -292,7 +294,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
292 | catch (Exception e) | 294 | catch (Exception e) |
293 | { | 295 | { |
294 | database.Reconnect(); | 296 | database.Reconnect(); |
295 | MainLog.Instance.Error(e.ToString()); | 297 | m_log.Error(e.ToString()); |
296 | return null; | 298 | return null; |
297 | } | 299 | } |
298 | } | 300 | } |
@@ -325,7 +327,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
325 | } | 327 | } |
326 | catch (MySqlException e) | 328 | catch (MySqlException e) |
327 | { | 329 | { |
328 | MainLog.Instance.Error(e.ToString()); | 330 | m_log.Error(e.ToString()); |
329 | } | 331 | } |
330 | 332 | ||
331 | return null; | 333 | return null; |
@@ -362,7 +364,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
362 | catch (Exception e) | 364 | catch (Exception e) |
363 | { | 365 | { |
364 | database.Reconnect(); | 366 | database.Reconnect(); |
365 | MainLog.Instance.Error(e.ToString()); | 367 | m_log.Error(e.ToString()); |
366 | } | 368 | } |
367 | return null; | 369 | return null; |
368 | } | 370 | } |
@@ -387,7 +389,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
387 | } | 389 | } |
388 | catch (Exception e) | 390 | catch (Exception e) |
389 | { | 391 | { |
390 | MainLog.Instance.Error(e.ToString()); | 392 | m_log.Error(e.ToString()); |
391 | } | 393 | } |
392 | 394 | ||
393 | return null; | 395 | return null; |
@@ -421,7 +423,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
421 | catch (Exception e) | 423 | catch (Exception e) |
422 | { | 424 | { |
423 | database.Reconnect(); | 425 | database.Reconnect(); |
424 | MainLog.Instance.Error(e.ToString()); | 426 | m_log.Error(e.ToString()); |
425 | return null; | 427 | return null; |
426 | } | 428 | } |
427 | } | 429 | } |
@@ -459,7 +461,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
459 | } | 461 | } |
460 | catch (MySqlException e) | 462 | catch (MySqlException e) |
461 | { | 463 | { |
462 | MainLog.Instance.Error(e.ToString()); | 464 | m_log.Error(e.ToString()); |
463 | } | 465 | } |
464 | } | 466 | } |
465 | 467 | ||
@@ -488,7 +490,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
488 | catch (MySqlException e) | 490 | catch (MySqlException e) |
489 | { | 491 | { |
490 | database.Reconnect(); | 492 | database.Reconnect(); |
491 | MainLog.Instance.Error(e.ToString()); | 493 | m_log.Error(e.ToString()); |
492 | } | 494 | } |
493 | } | 495 | } |
494 | 496 | ||
@@ -516,7 +518,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
516 | } | 518 | } |
517 | catch (Exception e) | 519 | catch (Exception e) |
518 | { | 520 | { |
519 | MainLog.Instance.Error(e.ToString()); | 521 | m_log.Error(e.ToString()); |
520 | } | 522 | } |
521 | } | 523 | } |
522 | 524 | ||
@@ -548,7 +550,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
548 | } | 550 | } |
549 | catch (Exception e) | 551 | catch (Exception e) |
550 | { | 552 | { |
551 | MainLog.Instance.Error(e.ToString()); | 553 | m_log.Error(e.ToString()); |
552 | } | 554 | } |
553 | } | 555 | } |
554 | 556 | ||
@@ -593,7 +595,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
593 | catch (MySqlException e) | 595 | catch (MySqlException e) |
594 | { | 596 | { |
595 | database.Reconnect(); | 597 | database.Reconnect(); |
596 | MainLog.Instance.Error(e.ToString()); | 598 | m_log.Error(e.ToString()); |
597 | } | 599 | } |
598 | } | 600 | } |
599 | 601 | ||
@@ -609,7 +611,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
609 | catch (MySqlException e) | 611 | catch (MySqlException e) |
610 | { | 612 | { |
611 | database.Reconnect(); | 613 | database.Reconnect(); |
612 | MainLog.Instance.Error(e.ToString()); | 614 | m_log.Error(e.ToString()); |
613 | } | 615 | } |
614 | } | 616 | } |
615 | 617 | ||