From 73045c5c439a616e9595004647e6520ee2e2d0af Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 3 Dec 2009 18:03:19 +0000
Subject: add extra logging on message service registrations with the user
 service this is to aid in diagnosing
 http://opensimulator.org/mantis/view.php?id=4351

---
 .../UserServer.Modules/MessageServersConnector.cs  | 48 +++++++++++++---------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
index 7df9768..15895bf 100644
--- a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
@@ -167,27 +167,37 @@ namespace OpenSim.Grid.UserServer.Modules
         }
         
         public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient)
-        {
+        {
+            m_log.DebugFormat(
+                "[MSGSERVER]: Beginning processing message service registration request from {0}",
+                remoteClient.Address);
+
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable responseData = new Hashtable();
-
-            if (requestData.Contains("uri"))
-            {
-                string URI = (string)requestData["uri"];
-                string sendkey=(string)requestData["sendkey"];
-                string recvkey=(string)requestData["recvkey"];
-                MessageServerInfo m = new MessageServerInfo();
-                m.URI = URI;
-                m.sendkey = sendkey;
-                m.recvkey = recvkey;
-                RegisterMessageServer(URI, m);
-                responseData["responsestring"] = "TRUE";
-                response.Value = responseData;
-
-                m_log.DebugFormat(
-                    "[MSGSERVER]: Successfully processed message service registration request from {0}", 
-                    remoteClient.Address);
+            Hashtable responseData = new Hashtable();
+
+            if (requestData.Contains("uri"))
+            {
+                string URI = (string)requestData["uri"];
+                string sendkey = (string)requestData["sendkey"];
+                string recvkey = (string)requestData["recvkey"];
+                MessageServerInfo m = new MessageServerInfo();
+                m.URI = URI;
+                m.sendkey = sendkey;
+                m.recvkey = recvkey;
+                RegisterMessageServer(URI, m);
+                responseData["responsestring"] = "TRUE";
+                response.Value = responseData;
+
+                m_log.DebugFormat(
+                    "[MSGSERVER]: Successfully processed message service registration request from {0}",
+                    remoteClient.Address);
+            }
+            else
+            {
+                m_log.ErrorFormat(
+                    "[MSGSERVER]: Message service registration request from {0} did not contain a uri, not registering",
+                    remoteClient.Address);
             }
             
             return response;
-- 
cgit v1.1