aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-09-13 02:29:04 +0000
committerSean Dague2008-09-13 02:29:04 +0000
commit39902fef776a42c1cb8086768f9751ff68288758 (patch)
treec5b756344d84b25b76b0bcaeef414bb3371cba0b
parent2 more InventoryItem tests, plus see if I can leave the log4net (diff)
downloadopensim-SC_OLD-39902fef776a42c1cb8086768f9751ff68288758.zip
opensim-SC_OLD-39902fef776a42c1cb8086768f9751ff68288758.tar.gz
opensim-SC_OLD-39902fef776a42c1cb8086768f9751ff68288758.tar.bz2
opensim-SC_OLD-39902fef776a42c1cb8086768f9751ff68288758.tar.xz
wrap log4net configure in try block so that it will run if you don't have a
.config (which no one does). Dropping in the .config lets you see that debug messages, which is handy while writing tests and figuring out why things don't behave like you would guess.
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 181a6a4..6e5c68d 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -48,7 +48,11 @@ namespace OpenSim.Data.SQLite.Tests
48 public void Init() 48 public void Init()
49 { 49 {
50 SuperInit(); 50 SuperInit();
51 log4net.Config.XmlConfigurator.Configure(); 51 try {
52 log4net.Config.XmlConfigurator.Configure();
53 } catch (Exception e) {
54 // I don't care, just leave log4net off
55 }
52 connect = "URI=file:" + file + ",version=3"; 56 connect = "URI=file:" + file + ",version=3";
53 db = new SQLiteInventoryStore(); 57 db = new SQLiteInventoryStore();
54 db.Initialise(connect); 58 db.Initialise(connect);