diff Implab/Diagnostics/TextFileListener.cs @ 50:f8cbe84cfdb1

Слияние с interactive logger
author cin
date Fri, 18 Apr 2014 12:37:48 +0400
parents d9d794b61bb9
children 4c0e5ef99986
line wrap: on
line diff
--- a/Implab/Diagnostics/TextFileListener.cs	Wed Apr 16 19:02:58 2014 +0400
+++ b/Implab/Diagnostics/TextFileListener.cs	Fri Apr 18 12:37:48 2014 +0400
@@ -8,21 +8,23 @@
     public class TextFileListener: TextListenerBase {
         readonly TextWriter m_textWriter;
 
-        public TextFileListener(string fileName, bool local) : base(local) {
+        public TextFileListener(string fileName, bool global)
+            : base(global) {
             m_textWriter = File.CreateText(fileName);
 
             m_textWriter.WriteLine("LOG {0}", DateTime.Now);
             Register(this);
         }
 
-        protected override void WriteEntry(TraceContext context, EventText text) {
+        protected override void WriteEntry(TraceContext context, EventText text, string channel) {
             var msg = new StringBuilder();
             for (int i = 0; i < text.indent; i++)
                 msg.Append("  ");
-            msg.AppendFormat("[{0}]: {1}", context.ThreadId, text.content);
+            msg.AppendFormat("[{0}]:{1}: {2}", context.ThreadId, channel, text.content);
 
             lock (m_textWriter) {
                 if (!IsDisposed) {
+                    // тут гарантировано еще не освобожден m_textWriter
                     m_textWriter.WriteLine(msg.ToString());
                     m_textWriter.Flush();
                 }
@@ -33,6 +35,7 @@
         protected override void Dispose(bool disposing) {
             base.Dispose(disposing);
             if (disposing) {
+                // IsDisposed = true
                 lock (m_textWriter) {
                     Safe.Dispose(m_textWriter);
                 }