OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

0.7.4-extended
Justin Clark-Casey (justincc) 2012-09-29 02:38:21 +01:00
parent ac03b1b82f
commit 8414ec9429
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -727,14 +727,14 @@ namespace OpenSim.Framework.Servers.HttpServer
const int sampleLength = 80; const int sampleLength = 80;
char[] sampleChars = new char[sampleLength]; char[] sampleChars = new char[sampleLength];
reader.Read(sampleChars, 0, sampleLength); reader.Read(sampleChars, 0, sampleLength);
output = string.Format("[BASE HTTP SERVER]: {0}...", new string(sampleChars).Replace("\n", @"\n")); output = new string(sampleChars);
} }
else else
{ {
output = string.Format("[BASE HTTP SERVER]: {0}", reader.ReadToEnd()); output = reader.ReadToEnd();
} }
m_log.Debug(output); m_log.DebugFormat("[BASE HTTP SERVER]: {0}...", output.Replace("\n", @"\n"));
} }
} }

4
OpenSim/Framework/Servers/MainServer.cs
View File

@ -177,9 +177,9 @@ namespace OpenSim.Framework.Servers
return; return;
} }
if (newDebug < 0 || newDebug > 5) if (newDebug < 0 || newDebug > 6)
{ {
MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..5", newDebug); MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..6", newDebug);
return; return;
} }