diff options
| author | Oren Hurvitz | 2014-04-29 09:58:03 +0300 |
|---|---|---|
| committer | Oren Hurvitz | 2014-04-29 07:59:17 +0100 |
| commit | 88f7a833dc1176afa802060317ea78ecf6818800 (patch) | |
| tree | 60453f1dd84aad3d3fd3001e1597f8f881af915b /OpenSim/Framework | |
| parent | Fixed the UpdateAgentInformation CAP: the viewer expects the simulator to ech... (diff) | |
| download | opensim-SC-88f7a833dc1176afa802060317ea78ecf6818800.zip opensim-SC-88f7a833dc1176afa802060317ea78ecf6818800.tar.gz opensim-SC-88f7a833dc1176afa802060317ea78ecf6818800.tar.bz2 opensim-SC-88f7a833dc1176afa802060317ea78ecf6818800.tar.xz | |
Improved HTTP logging
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Framework/WebUtil.cs | 5 |
2 files changed, 3 insertions, 4 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) |