From caa255bcdf6722062c660ed26844a68c5987ffd8 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 6 Feb 2008 20:59:31 +0000
Subject: make a couple more changes to get us back very close to old color
scheme
---
OpenSim/Framework/Console/OpenSimAppender.cs | 19 ++++++++++++++++---
bin/OpenSim.exe.config | 2 +-
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
override protected void Append(LoggingEvent le)
{
string loggingMessage = RenderLoggingEvent(le);
- string regex = @"^(?<Front>.*)\[(?<Category>\w+)\](?<End>.*)";
+ string regex = @"^(?<Front>.*?)\[(?<Category>\w+)\]:?(?<End>.*)";
Regex RE = new Regex(regex, RegexOptions.Multiline);
MatchCollection matches = RE.Matches(loggingMessage);
@@ -26,8 +26,21 @@ namespace OpenSim.Framework.Console
System.Console.Write("[");
WriteColorText(DeriveColor(matches[0].Groups["Category"].Value), matches[0].Groups["Category"].Value);
- System.Console.Write("]");
- System.Console.WriteLine(matches[0].Groups["End"].Value);
+ System.Console.Write("]:");
+
+ if (le.Level == Level.Error)
+ {
+ WriteColorText(ConsoleColor.Red, matches[0].Groups["End"].Value);
+ }
+ else if (le.Level == Level.Warn)
+ {
+ WriteColorText(ConsoleColor.Yellow, matches[0].Groups["End"].Value);
+ }
+ else
+ {
+ System.Console.Write(matches[0].Groups["End"].Value);
+ }
+ System.Console.WriteLine();
}
else
{
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 @@
<log4net>
<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%-5level - %message%newline" />
+ <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
</layout>
</appender>
<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
--
cgit v1.1