Author: dbera
Date: Thu Jan 17 22:44:04 2008
New Revision: 4397
URL: http://svn.gnome.org/viewvc/beagle?rev=4397&view=rev
Log:
Keep a buffer of last 4 messages with exception (effectively all multiline
messages) and if the same message is repeated, just print the first line with a
"(Repeated)" at the beginning. This will reduce same exceptions showing up
repeatedly in the log files and output.
Modified:
trunk/beagle/Util/Log.cs
Modified: trunk/beagle/Util/Log.cs
==============================================================================
--- trunk/beagle/Util/Log.cs (original)
+++ trunk/beagle/Util/Log.cs Thu Jan 17 22:44:04 2008
@@ -207,6 +207,31 @@
/////////////////////////////////////////////////////////////////////////////////////////
+ class SimpleQueue {
+ string[] buffer = new string [4]; // Keep a buffer of
last 4 big messages
+
+ public bool Add (string msg)
+ {
+ if (buffer [0] == msg ||
+ buffer [1] == msg ||
+ buffer [2] == msg ||
+ buffer [3] == msg)
+ return false;
+
+ buffer [0] = buffer [1];
+ buffer [1] = buffer [2];
+ buffer [2] = buffer [3];
+ buffer [3] = msg;
+
+ return true;
+ }
+
+ }
+
+ static private SimpleQueue msg_buffer = new SimpleQueue ();
+
+ /////////////////////////////////////////////////////////
+
static object write_lock = new object ();
static private void WriteLine (LogLevel level, string format,
object [] args, Exception ex)
@@ -214,10 +239,31 @@
if (level != LogLevel.Always && cutoff_level < level)
return;
- string ex_str = null;
+ string msg_string = null;
+ if (format != null)
+ msg_string = String.Format (format, args);
if (ex != null)
- ex_str = ex.ToString ();
-
+ msg_string = String.Concat (msg_string,
+ (msg_string != null
? "\n" : String.Empty),
+ ex);
+
+ // Use the buffer only for multiline messages, which
will mainly happen with exceptions
+ if (ex != null && ! msg_buffer.Add (msg_string)) {
+ msg_string = "(Repeated)";
+ if (format != null) {
+ msg_string = String.Format (format,
args);
+ int newline = msg_string.IndexOf ('\n');
+ if (newline != -1) {
+ msg_string =
msg_string.Substring (0, newline);
+ msg_string += " ...";
+ }
+ } else {
+ msg_string = ex.Message;
+ }
+
+ msg_string = "(Repeated) " + msg_string;
+ }
+
// This only happens if Log.Initialize was never called.
if (running_in_foreground && foreground_echo_writer ==
null)
foreground_echo_writer = Console.Out;
@@ -225,10 +271,9 @@
if (foreground_echo_writer != null) {
foreground_echo_writer.Write (level);
foreground_echo_writer.Write (": ");
- if (format != null)
- foreground_echo_writer.WriteLine
(format, args);
- if (ex_str != null)
- foreground_echo_writer.WriteLine
(ex_str);
+
+ if (msg_string != null)
+ foreground_echo_writer.WriteLine
(msg_string);
foreground_echo_writer.Flush ();
}
@@ -272,13 +317,8 @@
message = new StringBuilder ();
message.Append (prefix);
message.Remove (0, 1); // remove leading \n
- if (format != null)
- message.AppendFormat (format, args);
- if (ex_str != null) {
- if (format != null)
- message.Append ('\n');
- message.Append (ex_str);
- }
+ if (msg_string != null)
+ message.Append (msg_string);
message.Replace ("\n", prefix);
string message_str;
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
