From fc35b45e2176ee2dc8bf5627e84e463a2e9d3a52 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 13 Feb 2014 23:55:38 +0000
Subject: If calls to UserAgentServiceConnector fail then throw an exception.
 This lets the caller decide whether to discard the error or not.

This is Oren Hurvitz's 0001 patch from http://opensimulator.org/mantis/view.php?id=6956 but I ended up doing some tweaking to resolve patch application issues.
---
 .../Avatar/InstantMessage/HGMessageTransferModule.cs         | 12 +++++++++++-
 .../CoreModules/Avatar/UserProfiles/UserProfileModule.cs     | 11 ++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index 7bf19c2..d46cb55 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -282,7 +282,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         string uasURL = circuit.ServiceURLs["HomeURI"].ToString();
                         m_log.DebugFormat("[HG MESSAGE TRANSFER]: getting UUI of user {0} from {1}", toAgent, uasURL);
                         UserAgentServiceConnector uasConn = new UserAgentServiceConnector(uasURL);
-                        return uasConn.GetUUI(fromAgent, toAgent);
+
+                        string agentUUI = string.Empty;
+                        try
+                        {
+                            agentUUI = uasConn.GetUUI(fromAgent, toAgent);
+                        }
+                        catch (Exception e) {
+                            m_log.Warn("[HG MESSAGE TRANSFER]: GetUUI call failed ", e);
+                        }
+
+                        return agentUUI;
                     }
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 9ae7452..ed8864d 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1164,7 +1164,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
                 UserAgentServiceConnector uConn = new UserAgentServiceConnector(home_url);
 
-                Dictionary<string, object> account = uConn.GetUserInfo(userID);
+                Dictionary<string, object> account;
+                try
+                {
+                    account = uConn.GetUserInfo(userID);
+                }
+                catch (Exception e)
+                {
+                    m_log.Warn("[PROFILES]: GetUserInfo call failed ", e);
+                    account = new Dictionary<string, object>();
+                }
 
                 if (account.Count > 0)
                 {
-- 
cgit v1.1


From f49d51308938e397dbe44820b7497437fd785d10 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 14 Feb 2014 00:08:13 +0000
Subject: Change warns associated with UserAgentServiceConnector to debugs, as
 this is not necessarily a problen with the source simulator (e.g. someone
 else's remote simulator cannot be contacted).

This is Oren Hurvitz's second patch from http://opensimulator.org/mantis/view.php?id=6956 with a small amount of correction
---
 .../Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs | 2 +-
 OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index d46cb55..c51b30f 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -289,7 +289,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                             agentUUI = uasConn.GetUUI(fromAgent, toAgent);
                         }
                         catch (Exception e) {
-                            m_log.Warn("[HG MESSAGE TRANSFER]: GetUUI call failed ", e);
+                            m_log.Debug("[HG MESSAGE TRANSFER]: GetUUI call failed ", e);
                         }
 
                         return agentUUI;
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index ed8864d..9e6c752 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1171,7 +1171,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 }
                 catch (Exception e)
                 {
-                    m_log.Warn("[PROFILES]: GetUserInfo call failed ", e);
+                    m_log.Debug("[PROFILES]: GetUserInfo call failed ", e);
                     account = new Dictionary<string, object>();
                 }
 
-- 
cgit v1.1