Add more log messages for message service/user service get_friends_list interaction

2 files changed, 14 insertions, 6 deletions

diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
index 731946e..a3f4bf0 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
@@ -259,7 +259,11 @@ namespace OpenSim.Grid.MessagingServer.Modules
         /// </summary>
         /// <param name="friendlistowner">The agent that we're retreiving the friends Data for.</param>
         private Dictionary<UUID, FriendListItem> GetUserFriendList(UUID friendlistowner)
-        {
+        {

+            m_log.DebugFormat(
+                "[MESSAGE SERVICE]: Requesting friends list for {0} from {1}", 
+                friendlistowner, m_cfg.UserServerURL);
+
             Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();
 
             try
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
index 57a618d..ff57a07 100644
--- a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Grid.UserServer.Modules
 {
     public class UserServerFriendsModule
     {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private UserDataBaseService m_userDataBaseService;
 
@@ -56,12 +56,10 @@ namespace OpenSim.Grid.UserServer.Modules
 
         public void Initialise(IGridServiceCore core)
         {
-
         }
 
         public void PostInitialise()
         {
-
         }
 
         public void RegisterHandlers(BaseHttpServer httpServer)
@@ -158,7 +156,10 @@ namespace OpenSim.Grid.UserServer.Modules
         }
 
         public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
+        {

+            m_log.DebugFormat(
+                "[USER SERVER FRIENDS MODULE]: BEGIN XmlRpcResponseXmlRPCGetUserFriendList from {0}", remoteClient);
+
             // XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable)request.Params[0];
             // Hashtable responseData = new Hashtable();
@@ -168,7 +169,10 @@ namespace OpenSim.Grid.UserServer.Modules
             if (requestData.Contains("ownerID"))
             {
                 returndata = m_userDataBaseService.GetUserFriendList(new UUID((string)requestData["ownerID"]));
-            }
+            }

+

+            m_log.DebugFormat(

+                "[USER SERVER FRIENDS MODULE]: END XmlRpcResponseXmlRPCGetUserFriendList from {0}", remoteClient);
 
             return FriendListItemListtoXmlRPCResponse(returndata);
         }