aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-02-14 21:28:45 +0000
committerJustin Clark-Casey (justincc)2014-02-14 21:28:45 +0000
commit733e067958bb2ddbb016b97272473b3372563fc3 (patch)
tree2c4d0262d2c9a78d9c7e63e28bbe218f72059590
parentMerge branch 'justincc-master' (diff)
downloadopensim-SC_OLD-733e067958bb2ddbb016b97272473b3372563fc3.zip
opensim-SC_OLD-733e067958bb2ddbb016b97272473b3372563fc3.tar.gz
opensim-SC_OLD-733e067958bb2ddbb016b97272473b3372563fc3.tar.bz2
opensim-SC_OLD-733e067958bb2ddbb016b97272473b3372563fc3.tar.xz
Log information about which function, request data and agent ID triggered an XmlRpcGroupsServiceConnector error
-rw-r--r--OpenSim/Framework/Util.cs24
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs19
2 files changed, 29 insertions, 14 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 7bc8176..c7377b8 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1746,6 +1746,30 @@ namespace OpenSim.Framework
1746 } 1746 }
1747 1747
1748 /// <summary> 1748 /// <summary>
1749 /// Pretty format the hashtable contents to a single line.
1750 /// </summary>
1751 /// <remarks>
1752 /// Used for debugging output.
1753 /// </remarks>
1754 /// <param name='ht'></param>
1755 public static string PrettyFormatToSingleLine(Hashtable ht)
1756 {
1757 StringBuilder sb = new StringBuilder();
1758
1759 int i = 0;
1760
1761 foreach (string key in ht.Keys)
1762 {
1763 sb.AppendFormat("{0}:{1}", key, ht[key]);
1764
1765 if (++i < ht.Count)
1766 sb.AppendFormat(", ");
1767 }
1768
1769 return sb.ToString();
1770 }
1771
1772 /// <summary>
1749 /// Used to trigger an early library load on Windows systems. 1773 /// Used to trigger an early library load on Windows systems.
1750 /// </summary> 1774 /// </summary>
1751 /// <remarks> 1775 /// <remarks>
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index e28d0c2..a040f43 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1012 Hashtable respData = (Hashtable)resp.Value; 1012 Hashtable respData = (Hashtable)resp.Value;
1013 if (respData.Contains("error") && !respData.Contains("succeed")) 1013 if (respData.Contains("error") && !respData.Contains("succeed"))
1014 { 1014 {
1015 LogRespDataToConsoleError(respData); 1015 LogRespDataToConsoleError(requestingAgentID, function, param, respData);
1016 } 1016 }
1017 1017
1018 return respData; 1018 return respData;
@@ -1040,20 +1040,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1040 return error; 1040 return error;
1041 } 1041 }
1042 1042
1043 private void LogRespDataToConsoleError(Hashtable respData) 1043 private void LogRespDataToConsoleError(UUID requestingAgentID, string function, Hashtable param, Hashtable respData)
1044 { 1044 {
1045 m_log.Error("[XMLRPC-GROUPS-CONNECTOR]: Error:"); 1045 m_log.ErrorFormat(
1046 1046 "[XMLRPC-GROUPS-CONNECTOR]: Error when calling {0} for {1} with params {2}. Response params are {3}",
1047 foreach (string key in respData.Keys) 1047 function, requestingAgentID, Util.PrettyFormatToSingleLine(param), Util.PrettyFormatToSingleLine(respData));
1048 {
1049 m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: Key: {0}", key);
1050
1051 string[] lines = respData[key].ToString().Split(new char[] { '\n' });
1052 foreach (string line in lines)
1053 {
1054 m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0}", line);
1055 }
1056 }
1057 } 1048 }
1058 1049
1059 /// <summary> 1050 /// <summary>