aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Console/OpenSimAppender.cs19
-rw-r--r--bin/OpenSim.exe.config2
2 files changed, 17 insertions, 4 deletions
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index fb3c7c2..6b1ba39 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -15,7 +15,7 @@ namespace OpenSim.Framework.Console
15 override protected void Append(LoggingEvent le) 15 override protected void Append(LoggingEvent le)
16 { 16 {
17 string loggingMessage = RenderLoggingEvent(le); 17 string loggingMessage = RenderLoggingEvent(le);
18 string regex = @"^(?<Front>.*)\[(?<Category>\w+)\](?<End>.*)"; 18 string regex = @"^(?<Front>.*?)\[(?<Category>\w+)\]:?(?<End>.*)";
19 19
20 Regex RE = new Regex(regex, RegexOptions.Multiline); 20 Regex RE = new Regex(regex, RegexOptions.Multiline);
21 MatchCollection matches = RE.Matches(loggingMessage); 21 MatchCollection matches = RE.Matches(loggingMessage);
@@ -26,8 +26,21 @@ namespace OpenSim.Framework.Console
26 System.Console.Write("["); 26 System.Console.Write("[");
27 27
28 WriteColorText(DeriveColor(matches[0].Groups["Category"].Value), matches[0].Groups["Category"].Value); 28 WriteColorText(DeriveColor(matches[0].Groups["Category"].Value), matches[0].Groups["Category"].Value);
29 System.Console.Write("]"); 29 System.Console.Write("]:");
30 System.Console.WriteLine(matches[0].Groups["End"].Value); 30
31 if (le.Level == Level.Error)
32 {
33 WriteColorText(ConsoleColor.Red, matches[0].Groups["End"].Value);
34 }
35 else if (le.Level == Level.Warn)
36 {
37 WriteColorText(ConsoleColor.Yellow, matches[0].Groups["End"].Value);
38 }
39 else
40 {
41 System.Console.Write(matches[0].Groups["End"].Value);
42 }
43 System.Console.WriteLine();
31 } 44 }
32 else 45 else
33 { 46 {
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 0c6b1df..d38de24 100644
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -8,7 +8,7 @@
8 <log4net> 8 <log4net>
9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> 9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
10 <layout type="log4net.Layout.PatternLayout"> 10 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%-5level - %message%newline" /> 11 <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
12 </layout> 12 </layout>
13 </appender> 13 </appender>
14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> 14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">