Winify – Diff between revs 47 and 48

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 47 Rev 48
Line 108... Line 108...
108 { 108 {
109 _cancellationTokenSource.Dispose(); 109 _cancellationTokenSource.Dispose();
110 _cancellationTokenSource = null; 110 _cancellationTokenSource = null;
111 } 111 }
Line -... Line 112...
-   112  
-   113 if (_webSocketSharp != null)
112   114 {
113 _webSocketSharp.Close(); 115 _webSocketSharp.Close();
-   116 _webSocketSharp = null;
Line -... Line 117...
-   117 }
-   118  
114 _webSocketSharp = null; 119 if (_httpClient != null)
115   120 {
-   121 _httpClient.Dispose();
116 _httpClient.Dispose(); 122 _httpClient = null;
Line 117... Line 123...
117 _httpClient = null; 123 }
Line 118... Line 124...
118 } 124 }
Line 158... Line 164...
158 _webSocketSharp.ConnectAsync(); 164 _webSocketSharp.ConnectAsync();
159 } 165 }
Line 160... Line 166...
160   166  
161 private void WebSocketSharp_OnClose(object sender, CloseEventArgs e) 167 private void WebSocketSharp_OnClose(object sender, CloseEventArgs e)
162 { 168 {
163 Log.Information($"Connection to server closed with reason: {e.Reason}"); 169 Log.Information($"WebSockets connection to server {_webSocketsUri.AbsoluteUri} closed with reason {e.Reason}.");
Line 164... Line 170...
164 } 170 }
165   171  
166 private void WebSocketSharp_OnOpen(object sender, EventArgs e) 172 private void WebSocketSharp_OnOpen(object sender, EventArgs e)
167 { 173 {
Line 168... Line 174...
168 Log.Information("Connection to server is now open."); 174 Log.Information($"WebSockets connection to server {_webSocketsUri.AbsoluteUri} is now open.");
169 } 175 }
-   176  
-   177 private async void WebSocketSharp_OnError(object sender, ErrorEventArgs e)
170   178 {
171 private async void WebSocketSharp_OnError(object sender, ErrorEventArgs e) 179 Log.Error($"Connection to WebSockets server {_webSocketsUri.AbsoluteUri} terminated unexpectedly with message {e.Message}.", e.Exception);
172 { 180  
173 if (_cancellationToken.IsCancellationRequested) 181 if (_cancellationToken.IsCancellationRequested)
174 { 182 {
Line 175... Line 183...
175 Stop(); 183 Stop();
176 return; 184 return;
Line 177... Line 185...
177 } 185 }
178   186  
Line 179... Line 187...
179 await Task.Delay(TimeSpan.FromSeconds(1), _cancellationToken); 187 await Task.Delay(TimeSpan.FromSeconds(1), _cancellationToken);