Merge pull request #111 from progaudi/feature/naming-logging

Add name to logging

Author: roman-kozachenko

src/progaudi.tarantool/Model/ClientOptions.cs

@@ -17,8 +17,11 @@ public ClientOptions(string replicationSource, ILog log = null, MsgPackContext c
         private ClientOptions(ConnectionOptions options, ILog log, MsgPackContext context)
         {
             ConnectionOptions = options;
-            LogWriter = log;
             MsgPackContext = context ?? new MsgPackContext();
+            if (log != null)
+            {
+                LogWriter = new LogWriterWrapper(this, log);
+            }
         }
 
         public ILog LogWriter { get; }
@@ -28,5 +31,27 @@ private ClientOptions(ConnectionOptions options, ILog log, MsgPackContext contex
         public ConnectionOptions ConnectionOptions { get; }
 
         public string Name { get; set; }
+
+        private class LogWriterWrapper : ILog
+        {
+            private readonly ClientOptions _options;
+            private readonly ILog _log;
+
+            public LogWriterWrapper(ClientOptions options, ILog log)
+            {
+                _options = options;
+                _log = log;
+            }
+
+            public void WriteLine(string message)
+            {
+                _log.WriteLine($"[{_options.Name}] {message}");
+            }
+
+            public void Flush()
+            {
+                _log.Flush();
+            }
+        }
     }
 }

src/progaudi.tarantool/ResponseWriter.cs

@@ -38,7 +38,7 @@ public void BeginWriting()
                 throw new ObjectDisposedException(nameof(ResponseReader));
             }
 
-            _clientOptions?.LogWriter?.WriteLine($"Starting {_thread.Name}.");
+            _clientOptions?.LogWriter?.WriteLine("Starting thread");
             _thread.Start();
         }
 
@@ -51,7 +51,7 @@ public Task Write(ArraySegment<byte> header, ArraySegment<byte> body)
                 throw new ObjectDisposedException(nameof(ResponseReader));
             }
 
-            _clientOptions?.LogWriter?.WriteLine($"{_thread.Name} is enqueuing request: headers {header.Count} bytes, body {body.Count} bytes.");
+            _clientOptions?.LogWriter?.WriteLine($"Enqueuing request: headers {header.Count} bytes, body {body.Count} bytes.");
             bool shouldSignal;
             lock (_lock)
             {
@@ -120,12 +120,12 @@ Tuple<ArraySegment<byte>, ArraySegment<byte>> GetRequest()
             var count = 0;
             while ((request = GetRequest()) != null)
             {
-                _clientOptions?.LogWriter?.WriteLine($"{_thread.Name} is writing request: headers {request.Item1.Count} bytes, body {request.Item2.Count} bytes.");
+                _clientOptions?.LogWriter?.WriteLine($"Writing request: headers {request.Item1.Count} bytes, body {request.Item2.Count} bytes.");
 
                 WriteBuffer(request.Item1);
                 WriteBuffer(request.Item2);
 
-                _clientOptions?.LogWriter?.WriteLine($"{_thread.Name} wrote request: headers {request.Item1.Count} bytes, body {request.Item2.Count} bytes.");
+                _clientOptions?.LogWriter?.WriteLine($"Wrote request: headers {request.Item1.Count} bytes, body {request.Item2.Count} bytes.");
 
                 count++;
                 if (limit > 0 && count > limit)