Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix bug where debug http level 6 could not be specified. Also convert…

…s newlines at this level to '\n' to enable them to be logged.
  • Loading branch information...
commit f4579527551f474f68f368ffdd0cd0a89d31d504 1 parent 818379b
Justin Clark-Casey authored September 29, 2012
6  OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -727,14 +727,14 @@ private void LogIncomingInDetail(OSHttpRequest request)
727 727
                     const int sampleLength = 80;
728 728
                     char[] sampleChars = new char[sampleLength];
729 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 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
 
4  OpenSim/Framework/Servers/MainServer.cs
@@ -177,9 +177,9 @@ private static void HandleDebugHttpCommand(string module, string[] cmdparams)
177 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 183
                     return;
184 184
                 }
185 185
 

0 notes on commit f457952

Please sign in to comment.
Something went wrong with that request. Please try again.