diff options
author | Jeff Ames | 2008-02-05 19:44:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-05 19:44:27 +0000 |
commit | 6ed5283bc06a62f38eb517e67b975832b603bf61 (patch) | |
tree | e5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | |
parent | Cut down on the number of packets sent during terraforming. Terraforming shou... (diff) | |
download | opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.zip opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2 opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz |
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O.
This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs index ac7340d..2316de8 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | |||
@@ -39,6 +39,8 @@ namespace OpenSim.Framework.Data.SQLite | |||
39 | /// </summary> | 39 | /// </summary> |
40 | public class SQLiteUserData : SQLiteBase, IUserData | 40 | public class SQLiteUserData : SQLiteBase, IUserData |
41 | { | 41 | { |
42 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | |||
42 | /// <summary> | 44 | /// <summary> |
43 | /// The database manager | 45 | /// The database manager |
44 | /// </summary> | 46 | /// </summary> |
@@ -89,7 +91,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
89 | } | 91 | } |
90 | catch (SqliteSyntaxException) | 92 | catch (SqliteSyntaxException) |
91 | { | 93 | { |
92 | MainLog.Instance.Verbose("SQLITE", "userfriends table not found, creating.... "); | 94 | m_log.Info("[SQLITE]: userfriends table not found, creating.... "); |
93 | InitDB(conn); | 95 | InitDB(conn); |
94 | daf.Fill(ds.Tables["userfriends"]); | 96 | daf.Fill(ds.Tables["userfriends"]); |
95 | } | 97 | } |
@@ -217,7 +219,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
217 | } | 219 | } |
218 | catch (Exception ex) | 220 | catch (Exception ex) |
219 | { | 221 | { |
220 | MainLog.Instance.Error("USER", "Exception getting friends list for user: " + ex.ToString()); | 222 | m_log.Error("[USER]: Exception getting friends list for user: " + ex.ToString()); |
221 | } | 223 | } |
222 | } | 224 | } |
223 | 225 | ||
@@ -231,7 +233,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
231 | 233 | ||
232 | public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid) | 234 | public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid) |
233 | { | 235 | { |
234 | MainLog.Instance.Verbose("USER", "Stub UpdateUserCUrrentRegion called"); | 236 | m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); |
235 | } | 237 | } |
236 | 238 | ||
237 | 239 | ||
@@ -339,7 +341,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
339 | DataRow row = users.Rows.Find(Util.ToRawUuidString(AgentID)); | 341 | DataRow row = users.Rows.Find(Util.ToRawUuidString(AgentID)); |
340 | if (row == null) | 342 | if (row == null) |
341 | { | 343 | { |
342 | MainLog.Instance.Warn("WEBLOGIN", "Unable to store new web login key for non-existant user"); | 344 | m_log.Warn("[WEBLOGIN]: Unable to store new web login key for non-existant user"); |
343 | } | 345 | } |
344 | else | 346 | else |
345 | { | 347 | { |
@@ -411,7 +413,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
411 | } | 413 | } |
412 | } | 414 | } |
413 | 415 | ||
414 | MainLog.Instance.Verbose("SQLITE", | 416 | m_log.Info("[SQLITE]: " + |
415 | "Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored"); | 417 | "Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored"); |
416 | // save changes off to disk | 418 | // save changes off to disk |
417 | da.Update(ds, "users"); | 419 | da.Update(ds, "users"); |
@@ -775,7 +777,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
775 | } | 777 | } |
776 | catch (System.Exception) | 778 | catch (System.Exception) |
777 | { | 779 | { |
778 | MainLog.Instance.Verbose("USERS", "users table already exists"); | 780 | m_log.Info("[USERS]: users table already exists"); |
779 | } | 781 | } |
780 | 782 | ||
781 | try | 783 | try |
@@ -784,7 +786,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
784 | } | 786 | } |
785 | catch (System.Exception) | 787 | catch (System.Exception) |
786 | { | 788 | { |
787 | MainLog.Instance.Verbose("USERS", "userfriends table already exists"); | 789 | m_log.Info("[USERS]: userfriends table already exists"); |
788 | } | 790 | } |
789 | 791 | ||
790 | conn.Close(); | 792 | conn.Close(); |
@@ -807,7 +809,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
807 | } | 809 | } |
808 | catch (SqliteSyntaxException) | 810 | catch (SqliteSyntaxException) |
809 | { | 811 | { |
810 | MainLog.Instance.Verbose("DATASTORE", "SQLite Database doesn't exist... creating"); | 812 | m_log.Info("[DATASTORE]: SQLite Database doesn't exist... creating"); |
811 | InitDB(conn); | 813 | InitDB(conn); |
812 | } | 814 | } |
813 | conn.Open(); | 815 | conn.Open(); |