implab/ImplabNet Commit - r46:9ce97b262a7a

Слияние с default

cin -

r46:9ce97b262a7a interactive logger

parent child

Context file:

r46:9ce97b262a7a

Collapse all files

Implab/Diagnostics/ConsoleTraceListener.cs +10 0

@@ -8,6 +8,16 namespace Implab.Diagnostics {
8		8
9	static readonly object _consoleLock = new object();	9	static readonly object _consoleLock = new object();
10		10
		11	public ConsoleTraceListener()
		12	: base(true) {
		13
		14	}
		15
		16	public ConsoleTraceListener(bool local)
		17	: base(local) {
		18
		19	}
		20
11	protected override void WriteEntry(TraceContext context, EventText text) {	21	protected override void WriteEntry(TraceContext context, EventText text) {
12	var msg = new StringBuilder();	22	var msg = new StringBuilder();
13		23

Implab/Diagnostics/TextFileListener.cs +1 -1

                 public class TextFileListener: TextListenerBase {
                     readonly TextWriter m_textWriter;
-                    public TextFileListener(string fileName) {
+                    public TextFileListener(string fileName, bool local) : base(local) {
                         m_textWriter = File.CreateText(fileName);
                         m_textWriter.WriteLine("LOG {0}", DateTime.Now);

Implab/Diagnostics/TextListenerBase.cs +22 -2

                 public abstract class TextListenerBase : ServiceLocator, IEventTextFormatter<object>, IEventTextFormatter<TraceEvent> {
                     readonly Dictionary<object, Action> m_subscriptions = new Dictionary<object, Action>();
+                    readonly LogicalOperation m_boundOperation;
+                    readonly int m_baseIndent;
-                    protected TextListenerBase() {
+                    protected TextListenerBase(bool local) {
                         Register(this);
+                        if (local) {
+                            m_boundOperation = TraceContext.Current.CurrentOperation;
+                            m_baseIndent = Math.Max(0, m_boundOperation.Level - 1);
+                        }
                     }
                     public void Subscribe(Type eventType) {
                             var formatter = GetService<IEventTextFormatter<TEvent>>();
                             EventHandler<ValueEventArgs<TEvent>> handler = (sender, args) => {
-                                WriteEntry((TraceContext)sender, formatter.Format((TraceContext)sender, args.Value));
+                                TraceContext context = (TraceContext)sender;
+                                var text = formatter.Format(context, args.Value);
+                                text.indent -= m_baseIndent;
+                                if (IsRelated(context.CurrentOperation))
+                                    WriteEntry(context, text);
                             };
                             if (m_subscriptions.ContainsKey(channel))
                         }
                     }
+                    public bool IsRelated(LogicalOperation op) {
+                        if (m_boundOperation == null)
+                            return true;
+                        while (op != m_boundOperation && op.Level > m_boundOperation.Level)
+                            op = op.Parent;
+                        return op == m_boundOperation;
+                    }
                     public void Unsubscribe<TEvent>(LogChannel<TEvent> channel) {
                         if (channel == null)
                             throw new ArgumentNullException("channel");

Implab/Diagnostics/TraceContext.cs +9 0

                         try {
                             action();
                         } finally {
+                            _current.EndAllOperations();
                             _current = old;
                         }
                     }
                         }
                     }
+                    /// <summary>
+                    /// Заврешает все начатые в этом контексте операции
+                    /// </summary>
+                    public void EndAllOperations() {
+                        while (m_bound != m_currentOperation)
+                            EndLogicalOperation();
+                    }
                     void LogEvent(TraceEventType type, string format, params object[] args) {
                         LogChannel<TraceEvent>.Default.LogEvent(this, TraceEvent.Create(type, format, args));
                     }

Implab/Diagnostics/TraceEvent.cs +1 -1

                     }
                     public static TraceEvent Create(TraceEventType type, string format, params object[] args) {
-                        return new TraceEvent(type, String.Format(format ?? String.Empty, args));
+                        return new TraceEvent(type, format == null ? String.Empty : String.Format(format, args));
                     }
                 }
             }

Implab.v11.suo removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages