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.MySQL/MySQLUserData.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 'OpenSim/Framework/Data.MySQL/MySQLUserData.cs')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLUserData.cs | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs index 2ee20e0..0db727c 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs | |||
@@ -39,6 +39,8 @@ namespace OpenSim.Framework.Data.MySQL | |||
39 | /// </summary> | 39 | /// </summary> |
40 | internal class MySQLUserData : IUserData | 40 | internal class MySQLUserData : 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 | /// Database manager for MySQL | 45 | /// Database manager for MySQL |
44 | /// </summary> | 46 | /// </summary> |
@@ -119,7 +121,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
119 | database.ExecuteResourceSql("UpgradeUsersTableToVersion2.sql"); | 121 | database.ExecuteResourceSql("UpgradeUsersTableToVersion2.sql"); |
120 | return; | 122 | return; |
121 | } | 123 | } |
122 | //MainLog.Instance.Verbose("DB","DBVers:" + oldVersion); | 124 | //m_log.Info("[DB]: DBVers:" + oldVersion); |
123 | } | 125 | } |
124 | 126 | ||
125 | /// <summary> | 127 | /// <summary> |
@@ -164,7 +166,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
164 | catch (Exception e) | 166 | catch (Exception e) |
165 | { | 167 | { |
166 | database.Reconnect(); | 168 | database.Reconnect(); |
167 | MainLog.Instance.Error(e.ToString()); | 169 | m_log.Error(e.ToString()); |
168 | return null; | 170 | return null; |
169 | } | 171 | } |
170 | } | 172 | } |
@@ -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; | 214 | return; |
213 | } | 215 | } |
214 | } | 216 | } |
@@ -243,7 +245,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
243 | catch (Exception e) | 245 | catch (Exception e) |
244 | { | 246 | { |
245 | database.Reconnect(); | 247 | database.Reconnect(); |
246 | MainLog.Instance.Error(e.ToString()); | 248 | m_log.Error(e.ToString()); |
247 | return; | 249 | return; |
248 | } | 250 | } |
249 | } | 251 | } |
@@ -272,7 +274,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
272 | catch (Exception e) | 274 | catch (Exception e) |
273 | { | 275 | { |
274 | database.Reconnect(); | 276 | database.Reconnect(); |
275 | MainLog.Instance.Error(e.ToString()); | 277 | m_log.Error(e.ToString()); |
276 | return; | 278 | return; |
277 | } | 279 | } |
278 | } | 280 | } |
@@ -317,7 +319,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
317 | catch (Exception e) | 319 | catch (Exception e) |
318 | { | 320 | { |
319 | database.Reconnect(); | 321 | database.Reconnect(); |
320 | MainLog.Instance.Error(e.ToString()); | 322 | m_log.Error(e.ToString()); |
321 | return Lfli; | 323 | return Lfli; |
322 | } | 324 | } |
323 | 325 | ||
@@ -328,7 +330,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
328 | 330 | ||
329 | public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid) | 331 | public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid) |
330 | { | 332 | { |
331 | MainLog.Instance.Verbose("USER", "Stub UpdateUserCUrrentRegion called"); | 333 | m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); |
332 | } | 334 | } |
333 | 335 | ||
334 | 336 | ||
@@ -371,7 +373,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
371 | catch (Exception e) | 373 | catch (Exception e) |
372 | { | 374 | { |
373 | database.Reconnect(); | 375 | database.Reconnect(); |
374 | MainLog.Instance.Error(e.ToString()); | 376 | m_log.Error(e.ToString()); |
375 | return returnlist; | 377 | return returnlist; |
376 | } | 378 | } |
377 | } | 379 | } |
@@ -406,7 +408,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
406 | catch (Exception e) | 408 | catch (Exception e) |
407 | { | 409 | { |
408 | database.Reconnect(); | 410 | database.Reconnect(); |
409 | MainLog.Instance.Error(e.ToString()); | 411 | m_log.Error(e.ToString()); |
410 | return returnlist; | 412 | return returnlist; |
411 | } | 413 | } |
412 | } | 414 | } |
@@ -437,7 +439,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
437 | catch (Exception e) | 439 | catch (Exception e) |
438 | { | 440 | { |
439 | database.Reconnect(); | 441 | database.Reconnect(); |
440 | MainLog.Instance.Error(e.ToString()); | 442 | m_log.Error(e.ToString()); |
441 | return null; | 443 | return null; |
442 | } | 444 | } |
443 | } | 445 | } |
@@ -488,7 +490,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
488 | catch (Exception e) | 490 | catch (Exception e) |
489 | { | 491 | { |
490 | database.Reconnect(); | 492 | database.Reconnect(); |
491 | MainLog.Instance.Error(e.ToString()); | 493 | m_log.Error(e.ToString()); |
492 | return; | 494 | return; |
493 | } | 495 | } |
494 | 496 | ||
@@ -525,7 +527,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
525 | catch (Exception e) | 527 | catch (Exception e) |
526 | { | 528 | { |
527 | database.Reconnect(); | 529 | database.Reconnect(); |
528 | MainLog.Instance.Error(e.ToString()); | 530 | m_log.Error(e.ToString()); |
529 | return null; | 531 | return null; |
530 | } | 532 | } |
531 | } | 533 | } |
@@ -553,7 +555,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
553 | catch (Exception e) | 555 | catch (Exception e) |
554 | { | 556 | { |
555 | database.Reconnect(); | 557 | database.Reconnect(); |
556 | MainLog.Instance.Error(e.ToString()); | 558 | m_log.Error(e.ToString()); |
557 | } | 559 | } |
558 | } | 560 | } |
559 | 561 | ||