Enable diagnostics in release

src/Renci.SshNet/BaseClient.cs

@@ -1,9 +1,9 @@
 using System;
+using System.Diagnostics;
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 
-using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages.Transport;
 
@@ -317,7 +317,7 @@ public async Task ConnectAsync(CancellationToken cancellationToken)
         /// <exception cref="ObjectDisposedException">The method was called after the client was disposed.</exception>
         public void Disconnect()
         {
-            DiagnosticAbstraction.Log("Disconnecting client.");
+            Diagnostic.Log("Disconnecting client.", TraceEventType.Verbose);
 
             CheckDisposed();
 
@@ -416,7 +416,7 @@ protected virtual void Dispose(bool disposing)
 
             if (disposing)
             {
-                DiagnosticAbstraction.Log("Disposing client.");
+                Diagnostic.Log("Disposing client.", TraceEventType.Verbose);
 
                 Disconnect();
 

src/Renci.SshNet/Channels/Channel.cs

@@ -1,9 +1,9 @@
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.Net.Sockets;
 using System.Threading;
 
-using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages;
 using Renci.SshNet.Messages.Connection;
@@ -556,7 +556,7 @@ protected virtual void Close()
                         var closeWaitResult = _session.TryWait(_channelClosedWaitHandle, ConnectionInfo.ChannelCloseTimeout);
                         if (closeWaitResult != WaitResult.Success)
                         {
-                            DiagnosticAbstraction.Log(string.Format("Wait for channel close not successful: {0:G}.", closeWaitResult));
+                            Diagnostic.Log(string.Format("Wait for channel close not successful: {0:G}.", closeWaitResult), TraceEventType.Warning);
                         }
                     }
                 }

src/Renci.SshNet/Channels/ChannelDirectTcpip.cs

@@ -1,7 +1,9 @@
 using System;
+using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
+
 using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages.Connection;
@@ -156,8 +158,7 @@ private void ShutdownSocket(SocketShutdown how)
                 }
                 catch (SocketException ex)
                 {
-                    // TODO: log as warning
-                    DiagnosticAbstraction.Log("Failure shutting down socket: " + ex);
+                    Diagnostic.Log("Failure shutting down socket: " + ex, TraceEventType.Warning);
                 }
             }
         }

src/Renci.SshNet/Channels/ChannelForwardedTcpip.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
+
 using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages.Connection;
@@ -138,8 +140,7 @@ private void ShutdownSocket(SocketShutdown how)
                 }
                 catch (SocketException ex)
                 {
-                    // TODO: log as warning
-                    DiagnosticAbstraction.Log("Failure shutting down socket: " + ex);
+                    Diagnostic.Log("Failure shutting down socket: " + ex, TraceEventType.Warning);
                 }
             }
         }

src/Renci.SshNet/Common/Extensions.cs

@@ -315,5 +315,12 @@ internal static bool IsConnected(this Socket socket)
 
             return socket.Connected;
         }
+
+        internal static string Join(this IEnumerable<string> values, string separator)
+        {
+            // A sly way to prevent analyzers asking to "use an overload with a char parameter"
+            // which is not available on all targets.
+            return string.Join(separator, values);
+        }
     }
 }

src/Renci.SshNet/Connection/ConnectorBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
@@ -41,7 +42,7 @@ protected Socket SocketConnect(string host, int port, TimeSpan timeout)
             var ipAddress = Dns.GetHostAddresses(host)[0];
             var ep = new IPEndPoint(ipAddress, port);
 
-            DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port));
+            Diagnostic.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port), TraceEventType.Information);
 
             var socket = SocketFactory.Create(ep.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
 
@@ -81,7 +82,7 @@ protected async Task<Socket> SocketConnectAsync(string host, int port, Cancellat
 
             var ep = new IPEndPoint(ipAddress, port);
 
-            DiagnosticAbstraction.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port));
+            Diagnostic.Log(string.Format("Initiating connection to '{0}:{1}'.", host, port), TraceEventType.Information);
 
             var socket = SocketFactory.Create(ep.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
             try

src/Renci.SshNet/Abstractions/DiagnosticAbstraction.cs → src/Renci.SshNet/Diagnostic.cs

@@ -1,28 +1,24 @@
-using System.ComponentModel;
+using System;
 using System.Diagnostics;
 
-namespace Renci.SshNet.Abstractions
+namespace Renci.SshNet
 {
     /// <summary>
     /// Provides access to the <see cref="System.Diagnostics"/> internals of SSH.NET.
     /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class DiagnosticAbstraction
+    public static class Diagnostic
     {
         /// <summary>
         /// The <see cref="TraceSource"/> instance used by SSH.NET.
         /// </summary>
         /// <remarks>
         /// <para>
-        /// Currently, the library only traces events when compiled in Debug mode.
-        /// </para>
-        /// <para>
         /// Configuration on .NET Core must be done programmatically, e.g.
         /// <code>
-        /// DiagnosticAbstraction.Source.Switch = new SourceSwitch("sourceSwitch", "Verbose");
-        /// DiagnosticAbstraction.Source.Listeners.Remove("Default");
-        /// DiagnosticAbstraction.Source.Listeners.Add(new ConsoleTraceListener());
-        /// DiagnosticAbstraction.Source.Listeners.Add(new TextWriterTraceListener("trace.log"));
+        /// Diagnostics.Source.Switch = new SourceSwitch("sourceSwitch", nameof(SourceLevels.Verbose));
+        /// Diagnostics.Source.Listeners.Remove("Default");
+        /// Diagnostics.Source.Listeners.Add(new ConsoleTraceListener());
+        /// Diagnostics.Source.Listeners.Add(new TextWriterTraceListener("SshNetTrace.log"));
         /// </code>
         /// </para>
         /// <para>
@@ -53,17 +49,19 @@ public static class DiagnosticAbstraction
         public static readonly TraceSource Source = new TraceSource("SshNet.Logging");
 
         /// <summary>
-        /// Logs a message to <see cref="Source"/> at the <see cref="TraceEventType.Verbose"/>
-        /// level.
+        /// Logs a message to <see cref="Source"/> with the specified event type.
         /// </summary>
         /// <param name="text">The message to log.</param>
-        /// <param name="type">The trace event type.</param>
-        [Conditional("DEBUG")]
-        public static void Log(string text, TraceEventType type = TraceEventType.Verbose)
+        /// <param name="eventType">The trace event type.</param>
+        public static void Log(string text, TraceEventType eventType)
+        {
+            Source.TraceEvent(eventType, Environment.CurrentManagedThreadId, text);
+        }
+
+        /// <inheritdoc cref="SourceSwitch.ShouldTrace(TraceEventType)" />
+        public static bool IsEnabled(TraceEventType eventType)
         {
-            Source.TraceEvent(type,
-                              System.Environment.CurrentManagedThreadId,
-                              text);
+            return Source.Switch.ShouldTrace(eventType);
         }
     }
 }

src/Renci.SshNet/ForwardedPortDynamic.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Net;
@@ -413,8 +414,7 @@ private void InternalStop(TimeSpan timeout)
 
             if (!_pendingChannelCountdown.Wait(timeout))
             {
-                // TODO: log as warning
-                DiagnosticAbstraction.Log("Timeout waiting for pending channels in dynamic forwarded port to close.");
+                Diagnostic.Log("Timeout waiting for pending channels in dynamic forwarded port to close.", TraceEventType.Warning);
             }
         }
 

src/Renci.SshNet/ForwardedPortLocal.cs

@@ -1,9 +1,9 @@
 using System;
+using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 
-using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 
 namespace Renci.SshNet
@@ -399,8 +399,7 @@ private void InternalStop(TimeSpan timeout)
 
             if (!_pendingChannelCountdown.Wait(timeout))
             {
-                // TODO: log as warning
-                DiagnosticAbstraction.Log("Timeout waiting for pending channels in local forwarded port to close.");
+                Diagnostic.Log("Timeout waiting for pending channels in local forwarded port to close.", TraceEventType.Warning);
             }
         }
 

src/Renci.SshNet/ForwardedPortRemote.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.Net;
 using System.Threading;
@@ -213,8 +214,7 @@ protected override void StopPort(TimeSpan timeout)
 
             if (!_pendingChannelCountdown.Wait(timeout))
             {
-                // TODO: log as warning
-                DiagnosticAbstraction.Log("Timeout waiting for pending channels in remote forwarded port to close.");
+                Diagnostic.Log("Timeout waiting for pending channels in remote forwarded port to close.", TraceEventType.Warning);
             }
 
             _status = ForwardedPortStatus.Stopped;

src/Renci.SshNet/Messages/Transport/DisconnectMessage.cs

@@ -112,5 +112,11 @@ internal override void Process(Session session)
         {
             session.OnDisconnectReceived(this);
         }
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            return $"SSH_MSG_DISCONNECT ({ReasonCode}) {Description}";
+        }
     }
 }