diff options
| author | Oren Hurvitz | 2014-05-16 13:18:04 +0300 |
|---|---|---|
| committer | Oren Hurvitz | 2014-05-19 11:11:06 +0100 |
| commit | 882af7195ca6d7ac5f36f4121f65aab1302ad272 (patch) | |
| tree | 134f37e5f9b94a06dcb116b81b978c08b1f99537 /OpenSim/Framework/Servers/HttpServer | |
| parent | When can't rez, show only one error message; not two. And show more specific ... (diff) | |
| download | opensim-SC_OLD-882af7195ca6d7ac5f36f4121f65aab1302ad272.zip opensim-SC_OLD-882af7195ca6d7ac5f36f4121f65aab1302ad272.tar.gz opensim-SC_OLD-882af7195ca6d7ac5f36f4121f65aab1302ad272.tar.bz2 opensim-SC_OLD-882af7195ca6d7ac5f36f4121f65aab1302ad272.tar.xz | |
Better error-handling and logging in case User Profile requests fail
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs index ed6a14c..2fe1a7d 100644 --- a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs | |||
| @@ -90,14 +90,14 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 90 | } | 90 | } |
| 91 | catch (Exception e) | 91 | catch (Exception e) |
| 92 | { | 92 | { |
| 93 | m_log.Debug(string.Format("JsonRpc request '{0}' failed", method), e); | 93 | m_log.Debug(string.Format("JsonRpc request '{0}' to {1} failed", method, uri), e); |
| 94 | return false; | 94 | return false; |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | if (!response.ContainsKey("_Result")) | 97 | if (!response.ContainsKey("_Result")) |
| 98 | { | 98 | { |
| 99 | m_log.DebugFormat("JsonRpc request '{0}' returned an invalid response: {1}", | 99 | m_log.DebugFormat("JsonRpc request '{0}' to {1} returned an invalid response: {2}", |
| 100 | method, OSDParser.SerializeJsonString(response)); | 100 | method, uri, OSDParser.SerializeJsonString(response)); |
| 101 | return false; | 101 | return false; |
| 102 | } | 102 | } |
| 103 | response = (OSDMap)response["_Result"]; | 103 | response = (OSDMap)response["_Result"]; |
| @@ -107,15 +107,15 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 107 | if (response.ContainsKey("error")) | 107 | if (response.ContainsKey("error")) |
| 108 | { | 108 | { |
| 109 | data = response["error"]; | 109 | data = response["error"]; |
| 110 | m_log.DebugFormat("JsonRpc request '{0}' returned an error: {1}", | 110 | m_log.DebugFormat("JsonRpc request '{0}' to {1} returned an error: {2}", |
| 111 | method, OSDParser.SerializeJsonString(data)); | 111 | method, uri, OSDParser.SerializeJsonString(data)); |
| 112 | return false; | 112 | return false; |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | if (!response.ContainsKey("result")) | 115 | if (!response.ContainsKey("result")) |
| 116 | { | 116 | { |
| 117 | m_log.DebugFormat("JsonRpc request '{0}' returned an invalid response: {1}", | 117 | m_log.DebugFormat("JsonRpc request '{0}' to {1} returned an invalid response: {2}", |
| 118 | method, OSDParser.SerializeJsonString(response)); | 118 | method, uri, OSDParser.SerializeJsonString(response)); |
| 119 | return false; | 119 | return false; |
| 120 | } | 120 | } |
| 121 | 121 | ||
| @@ -161,14 +161,14 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 161 | } | 161 | } |
| 162 | catch (Exception e) | 162 | catch (Exception e) |
| 163 | { | 163 | { |
| 164 | m_log.Debug(string.Format("JsonRpc request '{0}' failed", method), e); | 164 | m_log.Debug(string.Format("JsonRpc request '{0}' to {1} failed", method, uri), e); |
| 165 | return false; | 165 | return false; |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | if (!response.ContainsKey("_Result")) | 168 | if (!response.ContainsKey("_Result")) |
| 169 | { | 169 | { |
| 170 | m_log.DebugFormat("JsonRpc request '{0}' returned an invalid response: {1}", | 170 | m_log.DebugFormat("JsonRpc request '{0}' to {1} returned an invalid response: {2}", |
| 171 | method, OSDParser.SerializeJsonString(response)); | 171 | method, uri, OSDParser.SerializeJsonString(response)); |
| 172 | return false; | 172 | return false; |
| 173 | } | 173 | } |
| 174 | response = (OSDMap)response["_Result"]; | 174 | response = (OSDMap)response["_Result"]; |
| @@ -176,8 +176,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 176 | if (response.ContainsKey("error")) | 176 | if (response.ContainsKey("error")) |
| 177 | { | 177 | { |
| 178 | data = response["error"]; | 178 | data = response["error"]; |
| 179 | m_log.DebugFormat("JsonRpc request '{0}' returned an error: {1}", | 179 | m_log.DebugFormat("JsonRpc request '{0}' to {1} returned an error: {2}", |
| 180 | method, OSDParser.SerializeJsonString(data)); | 180 | method, uri, OSDParser.SerializeJsonString(data)); |
| 181 | return false; | 181 | return false; |
| 182 | } | 182 | } |
| 183 | 183 | ||