aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-29 09:58:03 +0300
committerOren Hurvitz2014-04-29 07:59:17 +0100
commit88f7a833dc1176afa802060317ea78ecf6818800 (patch)
tree60453f1dd84aad3d3fd3001e1597f8f881af915b /OpenSim
parentFixed the UpdateAgentInformation CAP: the viewer expects the simulator to ech... (diff)
downloadopensim-SC_OLD-88f7a833dc1176afa802060317ea78ecf6818800.zip
opensim-SC_OLD-88f7a833dc1176afa802060317ea78ecf6818800.tar.gz
opensim-SC_OLD-88f7a833dc1176afa802060317ea78ecf6818800.tar.bz2
opensim-SC_OLD-88f7a833dc1176afa802060317ea78ecf6818800.tar.xz
Improved HTTP logging
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs2
-rw-r--r--OpenSim/Framework/WebUtil.cs5
-rw-r--r--OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs7
3 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index e8aa278..b92c25b 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -705,7 +705,7 @@ namespace OpenSim.Framework.Servers.HttpServer
705 } 705 }
706 } 706 }
707 707
708 WebUtil.LogResponseDetail(null, output); 708 WebUtil.LogResponseDetail(RequestNumber, output);
709 } 709 }
710 710
711 if (!response.SendChunked && response.ContentLength64 <= 0) 711 if (!response.SendChunked && response.ContentLength64 <= 0)
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index d7f6bc8..70fab77 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -214,10 +214,9 @@ namespace OpenSim.Framework
214 LogOutgoingDetail(string.Format("RESPONSE {0}: ", reqnum), inputStream); 214 LogOutgoingDetail(string.Format("RESPONSE {0}: ", reqnum), inputStream);
215 } 215 }
216 216
217 public static void LogResponseDetail(int? reqnum, string input) 217 public static void LogResponseDetail(int reqnum, string input)
218 { 218 {
219 string context = (reqnum == null) ? "" : string.Format("RESPONSE {0}: ", reqnum.Value); 219 LogOutgoingDetail(string.Format("RESPONSE {0}: ", reqnum), input);
220 LogOutgoingDetail(context, input);
221 } 220 }
222 221
223 private static OSDMap ServiceOSDRequestWorker(string url, OSDMap data, string method, int timeout, bool compressed, bool rpc) 222 private static OSDMap ServiceOSDRequestWorker(string url, OSDMap data, string method, int timeout, bool compressed, bool rpc)
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index d258293..85d105e 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -494,7 +494,12 @@ namespace OpenSim.Services.Connectors
494 private Dictionary<string,object> MakeRequest(string method, 494 private Dictionary<string,object> MakeRequest(string method,
495 Dictionary<string,object> sendData) 495 Dictionary<string,object> sendData)
496 { 496 {
497 sendData["METHOD"] = method; 497 // Add "METHOD" as the first key in the dictionary. This ensures that it will be
498 // visible even when using partial logging ("debug http all 5").
499 Dictionary<string, object> temp = sendData;
500 sendData = new Dictionary<string,object>{ { "METHOD", method } };
501 foreach (KeyValuePair<string, object> kvp in temp)
502 sendData.Add(kvp.Key, kvp.Value);
498 503
499 string reply = string.Empty; 504 string reply = string.Empty;
500 lock (m_Lock) 505 lock (m_Lock)