From 3ae9bb6d83540ef5acf3cbe4969d0f9c01164d21 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 20 May 2009 14:40:50 +0000
Subject: Move the color console logic from the appender into the local
 console, since that is the only one that can use it. Change appender output
 to always go through the console output functions.

---
 OpenSim/Framework/Console/OpenSimAppender.cs | 82 +++-------------------------
 1 file changed, 9 insertions(+), 73 deletions(-)

(limited to 'OpenSim/Framework/Console/OpenSimAppender.cs')

diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index 6193bac..400bd83 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -26,7 +26,6 @@
  */
 
 using System;
-using System.Text.RegularExpressions;
 using log4net.Appender;
 using log4net.Core;
 
@@ -45,62 +44,29 @@ namespace OpenSim.Framework.Console
             set { m_console = value; }
         }
 
-        private static readonly ConsoleColor[] Colors = {
-            // the dark colors don't seem to be visible on some black background terminals like putty :(
-            //ConsoleColor.DarkBlue,
-            //ConsoleColor.DarkGreen,
-            //ConsoleColor.DarkCyan,
-            //ConsoleColor.DarkMagenta,
-            //ConsoleColor.DarkYellow,
-            ConsoleColor.Gray,
-            //ConsoleColor.DarkGray,
-            ConsoleColor.Blue,
-            ConsoleColor.Green,
-            ConsoleColor.Cyan,
-            ConsoleColor.Magenta,
-            ConsoleColor.Yellow
-        };
-
         override protected void Append(LoggingEvent le)
         {
             if (m_console != null)
                 m_console.LockOutput();
 
+            string loggingMessage = RenderLoggingEvent(le);
+
             try
             {
-                string loggingMessage = RenderLoggingEvent(le);
-
-                string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)";
-
-                Regex RE = new Regex(regex, RegexOptions.Multiline);
-                MatchCollection matches = RE.Matches(loggingMessage);
-
-                // Get some direct matches $1 $4 is a
-                if (matches.Count == 1)
+                if (m_console != null)
                 {
-                    System.Console.Write(matches[0].Groups["Front"].Value);
-                    System.Console.Write("[");
-
-                    WriteColorText(DeriveColor(matches[0].Groups["Category"].Value), matches[0].Groups["Category"].Value);
-                    System.Console.Write("]:");
+                    string level = "normal";
 
                     if (le.Level == Level.Error)
-                    {
-                        WriteColorText(ConsoleColor.Red, matches[0].Groups["End"].Value);
-                    }
+                        level = "error";
                     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();
+                        level = "warn";
+
+                    m_console.Output(loggingMessage, level);
                 }
                 else
                 {
-                    System.Console.Write(loggingMessage);
+                    System.Console.WriteLine(loggingMessage);
                 }
             }
             catch (Exception e)
@@ -113,35 +79,5 @@ namespace OpenSim.Framework.Console
                     m_console.UnlockOutput();
             }
         }
-
-        private void WriteColorText(ConsoleColor color, string sender)
-        {
-            try
-            {
-                lock (this)
-                {
-                    try
-                    {
-                        System.Console.ForegroundColor = color;
-                        System.Console.Write(sender);
-                        System.Console.ResetColor();
-                    }
-                    catch (ArgumentNullException)
-                    {
-                        // Some older systems dont support coloured text.
-                        System.Console.WriteLine(sender);
-                    }
-                }
-            }
-            catch (ObjectDisposedException)
-            {
-            }
-        }
-
-        private static ConsoleColor DeriveColor(string input)
-        {
-            // it is important to do Abs, hash values can be negative
-            return Colors[(Math.Abs(input.ToUpper().GetHashCode()) % Colors.Length)];
-        }
     }
 }
-- 
cgit v1.1