Abstract Logger into interface and allow other loggers to be plugged in.

websocket-sharp/ILogger.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace WebSocketSharp
+{
+	public interface ILogger
+	{
+		string File { get; set; }
+		LogLevel Level { get; set; }
+		Action<LogData, string> Output { get; set; }
+
+		void Debug (string message);
+		void Error (string message);
+		void Fatal (string message);
+		void Info (string message);
+		void Trace (string message);
+		void Warn (string message);
+	}
+}

websocket-sharp/LogData.cs

@@ -33,7 +33,7 @@
 namespace WebSocketSharp
 {
   /// <summary>
-  /// Represents a log data used by the <see cref="Logger"/> class.
+  /// Represents a log data used by the <see cref="ILogger"/> class.
   /// </summary>
   public class LogData
   {

websocket-sharp/LogLevel.cs

@@ -58,6 +58,10 @@ public enum LogLevel
     /// <summary>
     /// Specifies the top logging level.
     /// </summary>
-    Fatal
+    Fatal,
+    /// <summary>
+    /// Specifies the ultimate logging level.
+    /// </summary>
+    None
   }
 }

websocket-sharp/Logger.cs

@@ -50,7 +50,7 @@ namespace WebSocketSharp
   ///   delegate.
   ///   </para>
   /// </remarks>
-  public class Logger
+  public class Logger : ILogger
   {
     #region Private Fields
 
@@ -263,11 +263,18 @@ public void Error (string message)
     /// <summary>
     /// Outputs <paramref name="message"/> as a log with <see cref="LogLevel.Fatal"/>.
     /// </summary>
+    /// <remarks>
+    /// If the current logging level is higher than <see cref="LogLevel.Fatal"/>,
+    /// this method doesn't output <paramref name="message"/> as a log.
+    /// </remarks>
     /// <param name="message">
     /// A <see cref="string"/> that represents the message to output as a log.
     /// </param>
     public void Fatal (string message)
     {
+      if (_level > LogLevel.Error)
+        return;
+
       output (message, LogLevel.Fatal);
     }
 

websocket-sharp/Net/HttpListener.cs

@@ -74,7 +74,7 @@ public sealed class HttpListener : IDisposable
     private bool                                                 _disposed;
     private bool                                                 _ignoreWriteExceptions;
     private volatile bool                                        _listening;
-    private Logger                                               _logger;
+    private ILogger                                               _logger;
     private HttpListenerPrefixCollection                         _prefixes;
     private string                                               _realm;
     private bool                                                 _reuseAddress;
@@ -288,9 +288,9 @@ public static bool IsSupported {
     /// values.
     /// </remarks>
     /// <value>
-    /// A <see cref="Logger"/> that provides the logging functions.
+    /// A <see cref="ILogger"/> that provides the logging functions.
     /// </value>
-    public Logger Log {
+    public ILogger Log {
       get {
         return _logger;
       }

websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs

@@ -59,7 +59,7 @@ internal HttpListenerWebSocketContext (HttpListenerContext context, string proto
 
     #region Internal Properties
 
-    internal Logger Log {
+    internal ILogger Log {
       get {
         return _context.Listener.Log;
       }

websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs

@@ -53,7 +53,7 @@ internal class TcpListenerWebSocketContext : WebSocketContext
     #region Private Fields
 
     private CookieCollection    _cookies;
-    private Logger              _logger;
+    private ILogger              _logger;
     private NameValueCollection _queryString;
     private HttpRequest         _request;
     private bool                _secure;
@@ -72,12 +72,12 @@ internal TcpListenerWebSocketContext (
       string protocol,
       bool secure,
       ServerSslConfiguration sslConfig,
-      Logger logger
+      ILogger ILogger
     )
     {
       _tcpClient = tcpClient;
       _secure = secure;
-      _logger = logger;
+      _logger = ILogger;
 
       var netStream = tcpClient.GetStream ();
       if (secure) {
@@ -110,7 +110,7 @@ Logger logger
 
     #region Internal Properties
 
-    internal Logger Log {
+    internal ILogger Log {
       get {
         return _logger;
       }

websocket-sharp/Server/HttpServer.cs

@@ -66,7 +66,7 @@ public class HttpServer
     private string                  _docRootPath;
     private string                  _hostname;
     private HttpListener            _listener;
-    private Logger                  _log;
+    private ILogger                  _log;
     private int                     _port;
     private Thread                  _receiveThread;
     private bool                    _secure;
@@ -506,12 +506,16 @@ public bool KeepClean {
     /// The default logging level is <see cref="LogLevel.Error"/>.
     /// </remarks>
     /// <value>
-    /// A <see cref="Logger"/> that provides the logging function.
+    /// A <see cref="ILogger"/> that provides the logging function.
     /// </value>
-    public Logger Log {
+    public ILogger Log {
       get {
         return _log;
       }
+			set {
+				if (value == null) throw new ArgumentOutOfRangeException(nameof(value));
+				_log = value;
+			}
     }
 
     /// <summary>

websocket-sharp/Server/WebSocketBehavior.cs

@@ -75,10 +75,10 @@ protected WebSocketBehavior ()
     /// Gets the logging functions.
     /// </summary>
     /// <value>
-    /// A <see cref="Logger"/> that provides the logging functions,
+    /// A <see cref="ILogger"/> that provides the logging functions,
     /// or <see langword="null"/> if the WebSocket connection isn't established.
     /// </value>
-    protected Logger Log {
+    protected ILogger Log {
       get {
         return _websocket != null ? _websocket.Log : null;
       }

websocket-sharp/Server/WebSocketServer.cs

@@ -65,7 +65,7 @@ public class WebSocketServer
     private bool                               _dnsStyle;
     private string                             _hostname;
     private TcpListener                        _listener;
-    private Logger                             _log;
+    private ILogger                             _log;
     private int                                _port;
     private string                             _realm;
     private string                             _realmInUse;
@@ -467,12 +467,16 @@ public bool KeepClean {
     /// The default logging level is <see cref="LogLevel.Error"/>.
     /// </remarks>
     /// <value>
-    /// A <see cref="Logger"/> that provides the logging function.
+    /// A <see cref="ILogger"/> that provides the logging function.
     /// </value>
-    public Logger Log {
+    public ILogger Log {
       get {
         return _log;
       }
+			set {
+				if (value == null) throw new ArgumentOutOfRangeException(nameof(value));
+				_log = value;
+			}
     }
 
     /// <summary>

websocket-sharp/Server/WebSocketServiceHost.cs

@@ -50,7 +50,7 @@ public abstract class WebSocketServiceHost
   {
     #region Private Fields
 
-    private Logger                  _log;
+    private ILogger                  _log;
     private string                  _path;
     private WebSocketSessionManager _sessions;
 
@@ -66,9 +66,9 @@ public abstract class WebSocketServiceHost
     /// A <see cref="string"/> that represents the absolute path to the service.
     /// </param>
     /// <param name="log">
-    /// A <see cref="Logger"/> that represents the logging function for the service.
+    /// A <see cref="ILogger"/> that represents the logging function for the service.
     /// </param>
-    protected WebSocketServiceHost (string path, Logger log)
+    protected WebSocketServiceHost (string path, ILogger log)
     {
       _path = path;
       _log = log;
@@ -94,9 +94,9 @@ internal ServerState State {
     /// Gets the logging function for the service.
     /// </summary>
     /// <value>
-    /// A <see cref="Logger"/> that provides the logging function.
+    /// A <see cref="ILogger"/> that provides the logging function.
     /// </value>
-    protected Logger Log {
+    protected ILogger Log {
       get {
         return _log;
       }

websocket-sharp/Server/WebSocketServiceHost`1.cs

@@ -42,7 +42,7 @@ internal class WebSocketServiceHost<TBehavior> : WebSocketServiceHost
     #region Internal Constructors
 
     internal WebSocketServiceHost (
-      string path, Func<TBehavior> creator, Logger log
+      string path, Func<TBehavior> creator, ILogger log
     )
       : this (path, creator, null, log)
     {
@@ -52,7 +52,7 @@ internal WebSocketServiceHost (
       string path,
       Func<TBehavior> creator,
       Action<TBehavior> initializer,
-      Logger log
+      ILogger log
     )
       : base (path, log)
     {

websocket-sharp/Server/WebSocketServiceManager.cs

@@ -49,7 +49,7 @@ public class WebSocketServiceManager
 
     private volatile bool                            _clean;
     private Dictionary<string, WebSocketServiceHost> _hosts;
-    private Logger                                   _log;
+    private ILogger                                   _log;
     private volatile ServerState                     _state;
     private object                                   _sync;
     private TimeSpan                                 _waitTime;
@@ -58,7 +58,7 @@ public class WebSocketServiceManager
 
     #region Internal Constructors
 
-    internal WebSocketServiceManager (Logger log)
+    internal WebSocketServiceManager (ILogger log)
     {
       _log = log;
 

websocket-sharp/Server/WebSocketSessionManager.cs

@@ -50,7 +50,7 @@ public class WebSocketSessionManager
 
     private volatile bool                         _clean;
     private object                                _forSweep;
-    private Logger                                _log;
+    private ILogger                                _log;
     private Dictionary<string, IWebSocketSession> _sessions;
     private volatile ServerState                  _state;
     private volatile bool                         _sweeping;
@@ -62,7 +62,7 @@ public class WebSocketSessionManager
 
     #region Internal Constructors
 
-    internal WebSocketSessionManager (Logger log)
+    internal WebSocketSessionManager (ILogger log)
     {
       _log = log;
 

websocket-sharp/WebSocket.cs

@@ -92,7 +92,7 @@ public class WebSocket : IDisposable
     private bool                           _ignoreExtensions;
     private bool                           _inContinuation;
     private volatile bool                  _inMessage;
-    private volatile Logger                _logger;
+    private volatile ILogger                _logger;
     private static readonly int            _maxRetryCountForConnect;
     private Action<MessageEventArgs>       _message;
     private Queue<MessageEventArgs>        _messageEventQueue;
@@ -511,14 +511,15 @@ public bool IsSecure {
     /// values.
     /// </remarks>
     /// <value>
-    /// A <see cref="Logger"/> that provides the logging functions.
+    /// A <see cref="ILogger"/> that provides the logging functions.
     /// </value>
-    public Logger Log {
+    public ILogger Log {
       get {
         return _logger;
       }
 
-      internal set {
+      set {
+				if (value == null) throw new ArgumentOutOfRangeException(nameof(value));
         _logger = value;
       }
     }