OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

slimupdates
Melanie 2010-04-30 21:13:31 +01:00
parent d0accc0732 f1164161b3
commit 0c2ab54d41
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
View File

@ -29,6 +29,8 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Reflection;
using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using Mono.Data.Sqlite; using Mono.Data.Sqlite;
@ -37,6 +39,8 @@ namespace OpenSim.Data.SQLite
{ {
public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string m_Realm; private string m_Realm;
private List<string> m_ColumnNames; private List<string> m_ColumnNames;
private int m_LastExpire; private int m_LastExpire;
@ -157,7 +161,7 @@ namespace OpenSim.Data.SQLite
} }
catch (Exception e) catch (Exception e)
{ {
Console.WriteLine(e.ToString()); m_log.Error("[SQLITE]: Exception storing authentication data", e);
//CloseCommand(cmd); //CloseCommand(cmd);
return false; return false;
} }

2
OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Data.SQLite
if (!m_initialized) if (!m_initialized)
{ {
m_Connection = new SqliteConnection(connectionString); m_Connection = new SqliteConnection(connectionString);
Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString)); //Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString));
m_Connection.Open(); m_Connection.Open();
if (storeName != String.Empty) if (storeName != String.Empty)

6
OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs
View File

@ -29,6 +29,8 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Reflection;
using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using Mono.Data.SqliteClient; using Mono.Data.SqliteClient;
@ -37,6 +39,8 @@ namespace OpenSim.Data.SQLiteLegacy
{ {
public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string m_Realm; private string m_Realm;
private List<string> m_ColumnNames; private List<string> m_ColumnNames;
private int m_LastExpire; private int m_LastExpire;
@ -162,7 +166,7 @@ namespace OpenSim.Data.SQLiteLegacy
} }
catch (Exception e) catch (Exception e)
{ {
Console.WriteLine(e.ToString()); m_log.Error("[SQLITE]: Exception storing authentication data", e);
CloseCommand(cmd); CloseCommand(cmd);
return false; return false;
} }