From 94b22e1d52d4763e2fcde8539748040de47f943b Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 1 Dec 2009 12:34:44 +0000
Subject: [PATCH] Add more stack trace information to some messaging server
 exceptions

---
 .../InterMessageUserServerModule.cs                 | 13 +++++++++----
 .../Grid/MessagingServer.Modules/MessageService.cs  |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs b/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
index 90490dc0b1..662dad3edb 100644
--- a/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
@@ -124,12 +124,15 @@ namespace OpenSim.Grid.MessagingServer.Modules
                     else
                         m_log.DebugFormat("[SERVER]: Registered with user service at {0}", srv);
                 }
-                catch
+                catch (Exception e)
                 {
-                    m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
+                    m_log.ErrorFormat(
+                        "[SERVER]: Unable to connect to server {0} for registration. User service not running?  Exception {1} {2}",
+                        srv, e.Message, e.StackTrace);
                     success = false;
                 }
             }
+            
             return success;
         }
 
@@ -176,9 +179,11 @@ namespace OpenSim.Grid.MessagingServer.Modules
                     if (!UserRespData.ContainsKey("responsestring"))
                         success = false;
                 }
-                catch
+                catch (Exception e)
                 {
-                    m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
+                    m_log.ErrorFormat(
+                        "[SERVER]: Unable to connect to server {0} for send. Server not running?  Exception {0} {1}", 
+                        srv, e.Message, e.StackTrace);
                     success = false;
                 }
             }
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
index 76784e5a42..3ab93a37d5 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
 
                 ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
 
-                m_log.InfoFormat("[LOGIN]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",
+                m_log.DebugFormat("[LOGIN]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",
                                  agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root");
 
                 UserPresenceData up = new UserPresenceData();
@@ -363,7 +363,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
             }
             catch (Exception e)
             {
-                m_log.WarnFormat("[LOGIN]: Exception on UserLoggedOn: {0}", e);
+                m_log.ErrorFormat("[LOGIN]: Exception on UserLoggedOn: {0} {1}", e.Message, e.StackTrace);
             }
 
             return new XmlRpcResponse();