aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie2010-04-30 21:13:31 +0100
committerMelanie2010-04-30 21:13:31 +0100
commit0c2ab54d4126f6a270f50d3f772241e2bd1fc138 (patch)
treea844744cac0382babf91955b87362fd0dbf3fe83 /OpenSim/Data
parentAllow retrieval if admin users in scope mode (diff)
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-0c2ab54d4126f6a270f50d3f772241e2bd1fc138.zip
opensim-SC_OLD-0c2ab54d4126f6a270f50d3f772241e2bd1fc138.tar.gz
opensim-SC_OLD-0c2ab54d4126f6a270f50d3f772241e2bd1fc138.tar.bz2
opensim-SC_OLD-0c2ab54d4126f6a270f50d3f772241e2bd1fc138.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAuthenticationData.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs2
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs6
3 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
index 086ac0a..a1412ff 100644
--- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -29,6 +29,8 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Reflection;
33using log4net;
32using OpenMetaverse; 34using OpenMetaverse;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using Mono.Data.Sqlite; 36using Mono.Data.Sqlite;
@@ -37,6 +39,8 @@ namespace OpenSim.Data.SQLite
37{ 39{
38 public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData 40 public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData
39 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43
40 private string m_Realm; 44 private string m_Realm;
41 private List<string> m_ColumnNames; 45 private List<string> m_ColumnNames;
42 private int m_LastExpire; 46 private int m_LastExpire;
@@ -157,7 +161,7 @@ namespace OpenSim.Data.SQLite
157 } 161 }
158 catch (Exception e) 162 catch (Exception e)
159 { 163 {
160 Console.WriteLine(e.ToString()); 164 m_log.Error("[SQLITE]: Exception storing authentication data", e);
161 //CloseCommand(cmd); 165 //CloseCommand(cmd);
162 return false; 166 return false;
163 } 167 }
diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 3c70aef..9b8e2fa 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Data.SQLite
59 if (!m_initialized) 59 if (!m_initialized)
60 { 60 {
61 m_Connection = new SqliteConnection(connectionString); 61 m_Connection = new SqliteConnection(connectionString);
62 Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString)); 62 //Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString));
63 m_Connection.Open(); 63 m_Connection.Open();
64 64
65 if (storeName != String.Empty) 65 if (storeName != String.Empty)
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs
index c64830a..760221d 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs
@@ -29,6 +29,8 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Reflection;
33using log4net;
32using OpenMetaverse; 34using OpenMetaverse;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using Mono.Data.SqliteClient; 36using Mono.Data.SqliteClient;
@@ -37,6 +39,8 @@ namespace OpenSim.Data.SQLiteLegacy
37{ 39{
38 public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData 40 public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData
39 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43
40 private string m_Realm; 44 private string m_Realm;
41 private List<string> m_ColumnNames; 45 private List<string> m_ColumnNames;
42 private int m_LastExpire; 46 private int m_LastExpire;
@@ -162,7 +166,7 @@ namespace OpenSim.Data.SQLiteLegacy
162 } 166 }
163 catch (Exception e) 167 catch (Exception e)
164 { 168 {
165 Console.WriteLine(e.ToString()); 169 m_log.Error("[SQLITE]: Exception storing authentication data", e);
166 CloseCommand(cmd); 170 CloseCommand(cmd);
167 return false; 171 return false;
168 } 172 }