aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-09-29 02:38:21 +0100
committerJustin Clark-Casey (justincc)2012-09-29 02:38:21 +0100
commitf4579527551f474f68f368ffdd0cd0a89d31d504 (patch)
treef93da602b11cfcd5d910ecfb395f1a5c457d6b04
parentFire EventManager.TriggerOnAttach (and hence LSL attach event) when an object... (diff)
downloadopensim-SC_OLD-f4579527551f474f68f368ffdd0cd0a89d31d504.zip
opensim-SC_OLD-f4579527551f474f68f368ffdd0cd0a89d31d504.tar.gz
opensim-SC_OLD-f4579527551f474f68f368ffdd0cd0a89d31d504.tar.bz2
opensim-SC_OLD-f4579527551f474f68f368ffdd0cd0a89d31d504.tar.xz
Fix bug where debug http level 6 could not be specified. Also converts newlines at this level to '\n' to enable them to be logged.
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs6
-rw-r--r--OpenSim/Framework/Servers/MainServer.cs4
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index d139235..ff57422 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -727,14 +727,14 @@ namespace OpenSim.Framework.Servers.HttpServer
727 const int sampleLength = 80; 727 const int sampleLength = 80;
728 char[] sampleChars = new char[sampleLength]; 728 char[] sampleChars = new char[sampleLength];
729 reader.Read(sampleChars, 0, sampleLength); 729 reader.Read(sampleChars, 0, sampleLength);
730 output = string.Format("[BASE HTTP SERVER]: {0}...", new string(sampleChars).Replace("\n", @"\n")); 730 output = new string(sampleChars);
731 } 731 }
732 else 732 else
733 { 733 {
734 output = string.Format("[BASE HTTP SERVER]: {0}", reader.ReadToEnd()); 734 output = reader.ReadToEnd();
735 } 735 }
736 736
737 m_log.Debug(output); 737 m_log.DebugFormat("[BASE HTTP SERVER]: {0}...", output.Replace("\n", @"\n"));
738 } 738 }
739 } 739 }
740 740
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 4b61b18..ae7d515 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -177,9 +177,9 @@ namespace OpenSim.Framework.Servers
177 return; 177 return;
178 } 178 }
179 179
180 if (newDebug < 0 || newDebug > 5) 180 if (newDebug < 0 || newDebug > 6)
181 { 181 {
182 MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..5", newDebug); 182 MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..6", newDebug);
183 return; 183 return;
184 } 184 }
185 185