From 00866bb9711e0ee882f0ec281ffb703891dcdf39 Mon Sep 17 00:00:00 2001 From: Jesper Date: Wed, 24 Aug 2016 20:30:49 +0200 Subject: [PATCH] moved RestartAfterListenError moved RestartAfterListenError to the WebSocketServer class --- src/Fleck/Interfaces/ISocket.cs | 1 - src/Fleck/SocketWrapper.cs | 7 ------- src/Fleck/WebSocketServer.cs | 3 ++- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Fleck/Interfaces/ISocket.cs b/src/Fleck/Interfaces/ISocket.cs index 6cc4a0d8..b6481a0a 100644 --- a/src/Fleck/Interfaces/ISocket.cs +++ b/src/Fleck/Interfaces/ISocket.cs @@ -15,7 +15,6 @@ public interface ISocket int RemotePort { get; } Stream Stream { get; } bool NoDelay { get; set; } - bool RestartAfterListenError { get; set; } EndPoint LocalEndPoint { get; } Task Accept(Action callback, Action error); diff --git a/src/Fleck/SocketWrapper.cs b/src/Fleck/SocketWrapper.cs index fce795dc..50324dfa 100644 --- a/src/Fleck/SocketWrapper.cs +++ b/src/Fleck/SocketWrapper.cs @@ -16,7 +16,6 @@ public class SocketWrapper : ISocket private Stream _stream; private CancellationTokenSource _tokenSource; private TaskFactory _taskFactory; - private bool _restartAfterListenError; public string RemoteIpAddress { @@ -87,12 +86,6 @@ public bool NoDelay set { _socket.NoDelay = value; } } - public bool RestartAfterListenError - { - get { return _restartAfterListenError; } - set { _restartAfterListenError = value; } - } - public EndPoint LocalEndPoint { get { return _socket.LocalEndPoint; } diff --git a/src/Fleck/WebSocketServer.cs b/src/Fleck/WebSocketServer.cs index 8dee2381..03a609c9 100644 --- a/src/Fleck/WebSocketServer.cs +++ b/src/Fleck/WebSocketServer.cs @@ -43,6 +43,7 @@ public WebSocketServer(int port, string location) public X509Certificate2 Certificate { get; set; } public SslProtocols EnabledSslProtocols { get; set; } public IEnumerable SupportedSubProtocols { get; set; } + public bool RestartAfterListenError {get; set; } public bool IsSecure { @@ -101,7 +102,7 @@ private void ListenForClients() { ListenerSocket.Accept(OnClientConnect, e => { FleckLog.Error("Listener socket is closed", e); - if(ListenerSocket.RestartAfterListenError){ + if(RestartAfterListenError){ FleckLog.Info("Listener socket restarting"); try {