aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-03-17 17:10:53 +0000
committerJeff Ames2008-03-17 17:10:53 +0000
commit825c89e7ac2ab2d545e6a45323ee24acd31f6756 (patch)
treeee1e73db608dba71e4a4c63ce0459e8e25eeb505
parent* Remove uninformative exception traces from remoting errors (diff)
downloadopensim-SC_OLD-825c89e7ac2ab2d545e6a45323ee24acd31f6756.zip
opensim-SC_OLD-825c89e7ac2ab2d545e6a45323ee24acd31f6756.tar.gz
opensim-SC_OLD-825c89e7ac2ab2d545e6a45323ee24acd31f6756.tar.bz2
opensim-SC_OLD-825c89e7ac2ab2d545e6a45323ee24acd31f6756.tar.xz
Replaced some Console.WriteLine calls with writes to log.
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs5
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs24
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs16
4 files changed, 27 insertions, 22 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 655abd7..93117fd 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -165,12 +165,13 @@ namespace OpenSim.Framework.Communications
165 else 165 else
166 { 166 {
167 m_inventoryService.CreateNewUserInventory(userProf.UUID); 167 m_inventoryService.CreateNewUserInventory(userProf.UUID);
168 System.Console.WriteLine("[USERS]: Created new inventory set for " + firstName + " " + lastName); 168 m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName);
169 return userProf.UUID; 169 return userProf.UUID;
170 } 170 }
171 } 171 }
172 172
173 #region Friend Methods 173 #region Friend Methods
174
174 /// <summary> 175 /// <summary>
175 /// Adds a new friend to the database for XUser 176 /// Adds a new friend to the database for XUser
176 /// </summary> 177 /// </summary>
@@ -181,6 +182,7 @@ namespace OpenSim.Framework.Communications
181 { 182 {
182 m_userService.AddNewUserFriend(friendlistowner, friend, perms); 183 m_userService.AddNewUserFriend(friendlistowner, friend, perms);
183 } 184 }
185
184 /// <summary> 186 /// <summary>
185 /// Logs off a user and does the appropriate communications 187 /// Logs off a user and does the appropriate communications
186 /// </summary> 188 /// </summary>
@@ -216,6 +218,7 @@ namespace OpenSim.Framework.Communications
216 { 218 {
217 m_userService.UpdateUserFriendPerms(friendlistowner, friend, perms); 219 m_userService.UpdateUserFriendPerms(friendlistowner, friend, perms);
218 } 220 }
221
219 /// <summary> 222 /// <summary>
220 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner 223 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner
221 /// </summary> 224 /// </summary>
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index f9d24e5..311a9c9 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -42,8 +42,10 @@ namespace OpenSim.Grid.UserServer
42 public class UserManager : UserManagerBase 42 public class UserManager : UserManagerBase
43 { 43 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
45
45 public event logOffUser OnLogOffUser; 46 public event logOffUser OnLogOffUser;
46 private logOffUser handlerLogOffUser = null; 47 private logOffUser handlerLogOffUser = null;
48
47 /// <summary> 49 /// <summary>
48 /// Deletes an active agent session 50 /// Deletes an active agent session
49 /// </summary> 51 /// </summary>
@@ -168,7 +170,7 @@ namespace OpenSim.Grid.UserServer
168 returnAvatar = GenerateAgentPickerRequestResponse(queryID, (string) requestData["avquery"]); 170 returnAvatar = GenerateAgentPickerRequestResponse(queryID, (string) requestData["avquery"]);
169 } 171 }
170 172
171 Console.WriteLine("[AVATARINFO]: Servicing Avatar Query: " + (string) requestData["avquery"]); 173 m_log.InfoFormat("[AVATARINFO]: Servicing Avatar Query: " + (string) requestData["avquery"]);
172 return AvatarPickerListtoXmlRPCResponse(queryID, returnAvatar); 174 return AvatarPickerListtoXmlRPCResponse(queryID, returnAvatar);
173 } 175 }
174 176
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 0a17b2f..d53201f 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -51,13 +51,13 @@ namespace OpenSim.Region.ClientStack
51 /// </summary> 51 /// </summary>
52 public class ClientView : IClientAPI 52 public class ClientView : IClientAPI
53 { 53 {
54 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
55
54 // ~ClientView() 56 // ~ClientView()
55 // { 57 // {
56 // System.Console.WriteLine("[CLIENTVIEW]: Destructor called"); 58 // m_log.Info("[CLIENTVIEW]: Destructor called");
57 // } 59 // }
58 60
59 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
60
61 /* static variables */ 61 /* static variables */
62 public static TerrainManager TerrainManager; 62 public static TerrainManager TerrainManager;
63 63
@@ -1820,7 +1820,7 @@ namespace OpenSim.Region.ClientStack
1820 public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint) 1820 public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)
1821 { 1821 {
1822 ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach); 1822 ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach);
1823 System.Console.WriteLine("Attach object!"); 1823 Console.WriteLine("Attach object!");
1824 // TODO: don't create new blocks if recycling an old packet 1824 // TODO: don't create new blocks if recycling an old packet
1825 attach.AgentData.AgentID = AgentId; 1825 attach.AgentData.AgentID = AgentId;
1826 attach.AgentData.SessionID = m_sessionId; 1826 attach.AgentData.SessionID = m_sessionId;
@@ -2340,7 +2340,7 @@ namespace OpenSim.Region.ClientStack
2340 /// <returns></returns> 2340 /// <returns></returns>
2341 protected bool AgentTextureCached(IClientAPI simclient, Packet packet) 2341 protected bool AgentTextureCached(IClientAPI simclient, Packet packet)
2342 { 2342 {
2343 //System.Console.WriteLine("texture cached: " + packet.ToString()); 2343 //Console.WriteLine("texture cached: " + packet.ToString());
2344 AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet; 2344 AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
2345 AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); 2345 AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
2346 // TODO: don't create new blocks if recycling an old packet 2346 // TODO: don't create new blocks if recycling an old packet
@@ -2368,7 +2368,7 @@ namespace OpenSim.Region.ClientStack
2368 protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet) 2368 protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet)
2369 { 2369 {
2370 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet; 2370 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
2371 // System.Console.WriteLine("new multi update packet " + multipleupdate.ToString()); 2371 // Console.WriteLine("new multi update packet " + multipleupdate.ToString());
2372 Scene tScene = (Scene)m_scene; 2372 Scene tScene = (Scene)m_scene;
2373 2373
2374 for (int i = 0; i < multipleupdate.ObjectData.Length; i++) 2374 for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
@@ -2407,7 +2407,7 @@ namespace OpenSim.Region.ClientStack
2407 if (handlerUpdatePrimSinglePosition != null) 2407 if (handlerUpdatePrimSinglePosition != null)
2408 { 2408 {
2409 2409
2410 // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 2410 // Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
2411 handlerUpdatePrimSinglePosition(localId, pos1, this); 2411 handlerUpdatePrimSinglePosition(localId, pos1, this);
2412 } 2412 }
2413 break; 2413 break;
@@ -2418,7 +2418,7 @@ namespace OpenSim.Region.ClientStack
2418 if (handlerUpdatePrimSingleRotation != null) 2418 if (handlerUpdatePrimSingleRotation != null)
2419 { 2419 {
2420 2420
2421 //System.Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 2421 //Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
2422 handlerUpdatePrimSingleRotation(localId, rot1, this); 2422 handlerUpdatePrimSingleRotation(localId, rot1, this);
2423 } 2423 }
2424 break; 2424 break;
@@ -2429,7 +2429,7 @@ namespace OpenSim.Region.ClientStack
2429 if (handlerUpdatePrimSingleRotation != null) 2429 if (handlerUpdatePrimSingleRotation != null)
2430 { 2430 {
2431 2431
2432 //System.Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 2432 //Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
2433 handlerUpdatePrimSingleRotation(localId, rot2, this); 2433 handlerUpdatePrimSingleRotation(localId, rot2, this);
2434 } 2434 }
2435 break; 2435 break;
@@ -2496,7 +2496,7 @@ namespace OpenSim.Region.ClientStack
2496 2496
2497 // Change the position based on scale (for bug number 246) 2497 // Change the position based on scale (for bug number 246)
2498 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 2498 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
2499 // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 2499 // Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
2500 if (handlerUpdatePrimSinglePosition != null) 2500 if (handlerUpdatePrimSinglePosition != null)
2501 { 2501 {
2502 handlerUpdatePrimSinglePosition(localId, pos4, this); 2502 handlerUpdatePrimSinglePosition(localId, pos4, this);
@@ -3311,7 +3311,7 @@ namespace OpenSim.Region.ClientStack
3311 AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack; 3311 AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack;
3312 AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData; 3312 AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData;
3313 AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data; 3313 AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data;
3314 //System.Console.WriteLine("Agent Sends:" + Helpers.FieldToUTF8String(querydata.Name)); 3314 //Console.WriteLine("Agent Sends:" + Helpers.FieldToUTF8String(querydata.Name));
3315 3315
3316 handlerAvatarPickerRequest = OnAvatarPickerRequest; 3316 handlerAvatarPickerRequest = OnAvatarPickerRequest;
3317 if (handlerAvatarPickerRequest != null) 3317 if (handlerAvatarPickerRequest != null)
@@ -4201,7 +4201,7 @@ namespace OpenSim.Region.ClientStack
4201 } 4201 }
4202 break; 4202 break;
4203 case PacketType.ParcelObjectOwnersRequest: 4203 case PacketType.ParcelObjectOwnersRequest:
4204 //System.Console.WriteLine(Pack.ToString()); 4204 //Console.WriteLine(Pack.ToString());
4205 ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack; 4205 ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack;
4206 4206
4207 handlerParcelObjectOwnerRequest = OnParcelObjectOwnerRequest; 4207 handlerParcelObjectOwnerRequest = OnParcelObjectOwnerRequest;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index f602e374..ea13b1b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -328,7 +328,7 @@ namespace OpenSim.Region.Communications.OGS1
328 328
329 if (responseData.ContainsKey("error")) 329 if (responseData.ContainsKey("error"))
330 { 330 {
331 Console.WriteLine("[OGS1 GRID SERVICES]: Error received from grid server" + responseData["error"]); 331 m_log.Error("[OGS1 GRID SERVICES]: Error received from grid server" + responseData["error"]);
332 return null; 332 return null;
333 } 333 }
334 334
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Communications.OGS1
588 } 588 }
589 else 589 else
590 { 590 {
591 Console.WriteLine("remoting object not found"); 591 m_log.Warn("[OGS1 GRID SERVICES]: remoting object not found");
592 } 592 }
593 remObject = null; 593 remObject = null;
594 //m_log.Info("[INTER]: " + 594 //m_log.Info("[INTER]: " +
@@ -699,7 +699,7 @@ namespace OpenSim.Region.Communications.OGS1
699 } 699 }
700 else 700 else
701 { 701 {
702 Console.WriteLine("[OGS1 GRID SERVICES]: remoting object not found"); 702 m_log.Warn("[OGS1 GRID SERVICES]: remoting object not found");
703 } 703 }
704 remObject = null; 704 remObject = null;
705 m_log.Info("[OGS1 GRID SERVICES]: " + 705 m_log.Info("[OGS1 GRID SERVICES]: " +
@@ -812,7 +812,7 @@ namespace OpenSim.Region.Communications.OGS1
812 } 812 }
813 else 813 else
814 { 814 {
815 Console.WriteLine("remoting object not found"); 815 m_log.Warn("[OGS1 GRID SERVICES]: remoting object not found");
816 } 816 }
817 remObject = null; 817 remObject = null;
818 m_log.Info("[INTER]: " + gdebugRegionName + ": OGS1 tried to inform region I'm up"); 818 m_log.Info("[INTER]: " + gdebugRegionName + ": OGS1 tried to inform region I'm up");
@@ -924,7 +924,7 @@ namespace OpenSim.Region.Communications.OGS1
924 } 924 }
925 else 925 else
926 { 926 {
927 Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); 927 m_log.Warn("[OGS1 GRID SERVICES]: Remoting object not found");
928 } 928 }
929 remObject = null; 929 remObject = null;
930 930
@@ -1010,7 +1010,7 @@ namespace OpenSim.Region.Communications.OGS1
1010 } 1010 }
1011 else 1011 else
1012 { 1012 {
1013 Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); 1013 m_log.Warn("[OGS1 GRID SERVICES]: Remoting object not found");
1014 } 1014 }
1015 remObject = null; 1015 remObject = null;
1016 1016
@@ -1066,7 +1066,7 @@ namespace OpenSim.Region.Communications.OGS1
1066 } 1066 }
1067 else 1067 else
1068 { 1068 {
1069 Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); 1069 m_log.Warn("[OGS1 GRID SERVICES]: Remoting object not found");
1070 } 1070 }
1071 remObject = null; 1071 remObject = null;
1072 1072
@@ -1140,7 +1140,7 @@ namespace OpenSim.Region.Communications.OGS1
1140 } 1140 }
1141 else 1141 else
1142 { 1142 {
1143 Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); 1143 m_log.Warn("[OGS1 GRID SERVICES]: Remoting object not found");
1144 } 1144 }
1145 remObject = null; 1145 remObject = null;
1146 1146