aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
diff options
context:
space:
mode:
authorJeff Ames2008-02-05 19:44:27 +0000
committerJeff Ames2008-02-05 19:44:27 +0000
commit6ed5283bc06a62f38eb517e67b975832b603bf61 (patch)
treee5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
parentCut down on the number of packets sent during terraforming. Terraforming shou... (diff)
downloadopensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.zip
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2
opensim-SC_OLD-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/Region/Communications/OGS1/OGS1UserServices.cs')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs60
1 files changed, 30 insertions, 30 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 70b7e89..9a22d14 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -40,6 +40,8 @@ namespace OpenSim.Region.Communications.OGS1
40{ 40{
41 public class OGS1UserServices : IUserService 41 public class OGS1UserServices : IUserService
42 { 42 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
44
43 private CommunicationsOGS1 m_parent; 45 private CommunicationsOGS1 m_parent;
44 46
45 public OGS1UserServices(CommunicationsOGS1 parent) 47 public OGS1UserServices(CommunicationsOGS1 parent)
@@ -51,10 +53,10 @@ namespace OpenSim.Region.Communications.OGS1
51 { 53 {
52 if (data.Contains("error_type")) 54 if (data.Contains("error_type"))
53 { 55 {
54 MainLog.Instance.Warn("GRID", 56 m_log.Warn("[GRID]: " +
55 "Error sent by user server when trying to get user profile: (" + 57 "Error sent by user server when trying to get user profile: (" +
56 data["error_type"] + 58 data["error_type"] +
57 "): " + data["error_desc"]); 59 "): " + data["error_desc"]);
58 return null; 60 return null;
59 } 61 }
60 62
@@ -104,7 +106,7 @@ namespace OpenSim.Region.Communications.OGS1
104 } 106 }
105 else 107 else
106 { 108 {
107 MainLog.Instance.Warn("INTERGRID", "Got invalid queryID from userServer"); 109 m_log.Warn("[INTERGRID]: Got invalid queryID from userServer");
108 } 110 }
109 return pickerlist; 111 return pickerlist;
110 } 112 }
@@ -158,7 +160,7 @@ namespace OpenSim.Region.Communications.OGS1
158 } 160 }
159 catch (System.Net.WebException) 161 catch (System.Net.WebException)
160 { 162 {
161 MainLog.Instance.Warn("LOGOFF", "Unable to notify grid server of user logoff"); 163 m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff");
162 } 164 }
163 165
164 166
@@ -186,8 +188,8 @@ namespace OpenSim.Region.Communications.OGS1
186 } 188 }
187 catch (WebException e) 189 catch (WebException e)
188 { 190 {
189 MainLog.Instance.Warn("Error when trying to fetch Avatar Picker Response: " + 191 m_log.Warn("Error when trying to fetch Avatar Picker Response: " +
190 e.Message); 192 e.Message);
191 // Return Empty picker list (no results) 193 // Return Empty picker list (no results)
192 } 194 }
193 return pickerlist; 195 return pickerlist;
@@ -209,8 +211,8 @@ namespace OpenSim.Region.Communications.OGS1
209 } 211 }
210 catch (WebException e) 212 catch (WebException e)
211 { 213 {
212 MainLog.Instance.Warn("Error when trying to fetch profile data by name from remote user server: " + 214 m_log.Warn("Error when trying to fetch profile data by name from remote user server: " +
213 e.Message); 215 e.Message);
214 } 216 }
215 return null; 217 return null;
216 } 218 }
@@ -299,24 +301,24 @@ namespace OpenSim.Region.Communications.OGS1
299 } 301 }
300 else 302 else
301 { 303 {
302 MainLog.Instance.Warn("GRID", "Unable to add new friend, User Server Reported an issue"); 304 m_log.Warn("[GRID]: Unable to add new friend, User Server Reported an issue");
303 } 305 }
304 } 306 }
305 else 307 else
306 { 308 {
307 MainLog.Instance.Warn("GRID", "Unable to add new friend, UserServer didn't understand me!"); 309 m_log.Warn("[GRID]: Unable to add new friend, UserServer didn't understand me!");
308 } 310 }
309 } 311 }
310 else 312 else
311 { 313 {
312 MainLog.Instance.Warn("GRID", "Unable to add new friend, UserServer didn't understand me!"); 314 m_log.Warn("[GRID]: Unable to add new friend, UserServer didn't understand me!");
313 315
314 } 316 }
315 } 317 }
316 catch (WebException e) 318 catch (WebException e)
317 { 319 {
318 MainLog.Instance.Warn("GRID","Error when trying to AddNewUserFriend: " + 320 m_log.Warn("[GRID]: Error when trying to AddNewUserFriend: " +
319 e.Message); 321 e.Message);
320 322
321 } 323 }
322 324
@@ -352,24 +354,24 @@ namespace OpenSim.Region.Communications.OGS1
352 } 354 }
353 else 355 else
354 { 356 {
355 MainLog.Instance.Warn("GRID", "Unable to remove friend, User Server Reported an issue"); 357 m_log.Warn("[GRID]: Unable to remove friend, User Server Reported an issue");
356 } 358 }
357 } 359 }
358 else 360 else
359 { 361 {
360 MainLog.Instance.Warn("GRID", "Unable to remove friend, UserServer didn't understand me!"); 362 m_log.Warn("[GRID]: Unable to remove friend, UserServer didn't understand me!");
361 } 363 }
362 } 364 }
363 else 365 else
364 { 366 {
365 MainLog.Instance.Warn("GRID", "Unable to remove friend, UserServer didn't understand me!"); 367 m_log.Warn("[GRID]: Unable to remove friend, UserServer didn't understand me!");
366 368
367 } 369 }
368 } 370 }
369 catch (WebException e) 371 catch (WebException e)
370 { 372 {
371 MainLog.Instance.Warn("GRID", "Error when trying to RemoveUserFriend: " + 373 m_log.Warn("[GRID]: Error when trying to RemoveUserFriend: " +
372 e.Message); 374 e.Message);
373 375
374 } 376 }
375 } 377 }
@@ -404,25 +406,24 @@ namespace OpenSim.Region.Communications.OGS1
404 } 406 }
405 else 407 else
406 { 408 {
407 MainLog.Instance.Warn("GRID", "Unable to update_user_friend_perms, User Server Reported an issue"); 409 m_log.Warn("[GRID]: Unable to update_user_friend_perms, User Server Reported an issue");
408 } 410 }
409 } 411 }
410 else 412 else
411 { 413 {
412 MainLog.Instance.Warn("GRID", "Unable to update_user_friend_perms, UserServer didn't understand me!"); 414 m_log.Warn("[GRID]: Unable to update_user_friend_perms, UserServer didn't understand me!");
413 } 415 }
414 } 416 }
415 else 417 else
416 { 418 {
417 MainLog.Instance.Warn("GRID", "Unable to update_user_friend_perms, UserServer didn't understand me!"); 419 m_log.Warn("[GRID]: Unable to update_user_friend_perms, UserServer didn't understand me!");
418 420
419 } 421 }
420 } 422 }
421 catch (WebException e) 423 catch (WebException e)
422 { 424 {
423 MainLog.Instance.Warn("GRID", "Error when trying to update_user_friend_perms: " + 425 m_log.Warn("[GRID]: Error when trying to update_user_friend_perms: " +
424 e.Message); 426 e.Message);
425
426 } 427 }
427 } 428 }
428 /// <summary> 429 /// <summary>
@@ -452,14 +453,13 @@ namespace OpenSim.Region.Communications.OGS1
452 } 453 }
453 catch (WebException e) 454 catch (WebException e)
454 { 455 {
455 MainLog.Instance.Warn("Error when trying to fetch Avatar's friends list: " + 456 m_log.Warn("Error when trying to fetch Avatar's friends list: " +
456 e.Message); 457 e.Message);
457 // Return Empty list (no friends) 458 // Return Empty list (no friends)
458 } 459 }
459 return buddylist; 460 return buddylist;
460
461 } 461 }
462 462
463 #endregion 463 #endregion
464 } 464 }
465} \ No newline at end of file 465}