diff options
Diffstat (limited to 'OpenSim/Framework/Console')
-rw-r--r-- | OpenSim/Framework/Console/ConsoleBase.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Console/OpenSimAppender.cs | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index 79fe1d4..74e64e3 100644 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Console | |||
58 | } | 58 | } |
59 | 59 | ||
60 | /// <summary> | 60 | /// <summary> |
61 | /// derive an ansi color from a string, ignoring the darker colors. | 61 | /// derive an ansi color from a string, ignoring the darker colors. |
62 | /// This is used to help automatically bin component tags with colors | 62 | /// This is used to help automatically bin component tags with colors |
63 | /// in various print functions. | 63 | /// in various print functions. |
64 | /// </summary> | 64 | /// </summary> |
@@ -195,7 +195,7 @@ namespace OpenSim.Framework.Console | |||
195 | System.Console.WriteLine(args); | 195 | System.Console.WriteLine(args); |
196 | } | 196 | } |
197 | } | 197 | } |
198 | } | 198 | } |
199 | catch (ObjectDisposedException) | 199 | catch (ObjectDisposedException) |
200 | { | 200 | { |
201 | } | 201 | } |
@@ -232,7 +232,7 @@ namespace OpenSim.Framework.Console | |||
232 | { | 232 | { |
233 | } | 233 | } |
234 | } | 234 | } |
235 | 235 | ||
236 | public string ReadLine() | 236 | public string ReadLine() |
237 | { | 237 | { |
238 | try | 238 | try |
@@ -245,7 +245,7 @@ namespace OpenSim.Framework.Console | |||
245 | return String.Empty; | 245 | return String.Empty; |
246 | } | 246 | } |
247 | } | 247 | } |
248 | 248 | ||
249 | public int Read() | 249 | public int Read() |
250 | { | 250 | { |
251 | return System.Console.Read(); | 251 | return System.Console.Read(); |
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs index d381179..ddd6d9a 100644 --- a/OpenSim/Framework/Console/OpenSimAppender.cs +++ b/OpenSim/Framework/Console/OpenSimAppender.cs | |||
@@ -40,32 +40,32 @@ namespace OpenSim.Framework.Console | |||
40 | string loggingMessage = RenderLoggingEvent(le); | 40 | string loggingMessage = RenderLoggingEvent(le); |
41 | 41 | ||
42 | string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)"; | 42 | string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)"; |
43 | 43 | ||
44 | Regex RE = new Regex(regex, RegexOptions.Multiline); | 44 | Regex RE = new Regex(regex, RegexOptions.Multiline); |
45 | MatchCollection matches = RE.Matches(loggingMessage); | 45 | MatchCollection matches = RE.Matches(loggingMessage); |
46 | // Get some direct matches $1 $4 is a | 46 | // Get some direct matches $1 $4 is a |
47 | if (matches.Count == 1) | 47 | if (matches.Count == 1) |
48 | { | 48 | { |
49 | System.Console.Write(matches[0].Groups["Front"].Value); | 49 | System.Console.Write(matches[0].Groups["Front"].Value); |
50 | System.Console.Write("["); | 50 | System.Console.Write("["); |
51 | 51 | ||
52 | WriteColorText(DeriveColor(matches[0].Groups["Category"].Value), matches[0].Groups["Category"].Value); | 52 | WriteColorText(DeriveColor(matches[0].Groups["Category"].Value), matches[0].Groups["Category"].Value); |
53 | System.Console.Write("]:"); | 53 | System.Console.Write("]:"); |
54 | 54 | ||
55 | if (le.Level == Level.Error) | 55 | if (le.Level == Level.Error) |
56 | { | 56 | { |
57 | WriteColorText(ConsoleColor.Red, matches[0].Groups["End"].Value); | 57 | WriteColorText(ConsoleColor.Red, matches[0].Groups["End"].Value); |
58 | } | 58 | } |
59 | else if (le.Level == Level.Warn) | 59 | else if (le.Level == Level.Warn) |
60 | { | 60 | { |
61 | WriteColorText(ConsoleColor.Yellow, matches[0].Groups["End"].Value); | 61 | WriteColorText(ConsoleColor.Yellow, matches[0].Groups["End"].Value); |
62 | } | 62 | } |
63 | else | 63 | else |
64 | { | 64 | { |
65 | System.Console.Write(matches[0].Groups["End"].Value); | 65 | System.Console.Write(matches[0].Groups["End"].Value); |
66 | } | 66 | } |
67 | System.Console.WriteLine(); | 67 | System.Console.WriteLine(); |
68 | } | 68 | } |
69 | else | 69 | else |
70 | { | 70 | { |
71 | System.Console.Write(loggingMessage); | 71 | System.Console.Write(loggingMessage); |