Horizon – Diff between revs 20 and 21
?pathlinks?
Rev 20 | Rev 21 | |||
---|---|---|---|---|
Line 171... | Line 171... | |||
171 | |
171 | |
|
172 | _horizonNetworkShare = new WatsonTcpServer("0.0.0.0", freePort); |
172 | _horizonNetworkShare = new WatsonTcpServer("0.0.0.0", freePort); |
|
173 | _horizonNetworkShare.Events.ClientConnected += Events_ClientConnected; |
173 | _horizonNetworkShare.Events.ClientConnected += Events_ClientConnected; |
|
174 | _horizonNetworkShare.Events.ClientDisconnected += Events_ClientDisconnected; |
174 | _horizonNetworkShare.Events.ClientDisconnected += Events_ClientDisconnected; |
|
- | 175 | _horizonNetworkShare.Events.MessageReceived += Events_MessageReceived; |
||
175 | _horizonNetworkShare.Events.MessageReceived += Events_MessageReceived; |
176 | _horizonNetworkShare.Events.ExceptionEncountered += Events_ExceptionEncountered; |
|
176 | #pragma warning disable CS4014 |
177 | #pragma warning disable CS4014 |
|
177 | _horizonNetworkShare.Start(); |
178 | _horizonNetworkShare.Start(); |
|
Line 178... | Line 179... | |||
178 | #pragma warning restore CS4014 |
179 | #pragma warning restore CS4014 |
|
Line 194... | Line 195... | |||
194 | Configuration.NetworkSharing = true; |
195 | Configuration.NetworkSharing = true; |
|
195 | break; |
196 | break; |
|
196 | case CheckState.Unchecked: |
197 | case CheckState.Unchecked: |
|
197 | if (_horizonNetworkShare != null) |
198 | if (_horizonNetworkShare != null) |
|
198 | { |
199 | { |
|
- | 200 | _horizonNetworkShare.Events.ClientConnected -= Events_ClientConnected; |
||
- | 201 | _horizonNetworkShare.Events.ClientDisconnected -= Events_ClientDisconnected; |
||
- | 202 | _horizonNetworkShare.Events.MessageReceived -= Events_MessageReceived; |
||
- | 203 | _horizonNetworkShare.Events.ExceptionEncountered -= Events_ExceptionEncountered; |
||
- | 204 | |
||
199 | _horizonNetworkShare.Dispose(); |
205 | _horizonNetworkShare.Dispose(); |
|
200 | _horizonNetworkShare = null; |
206 | _horizonNetworkShare = null; |
|
201 | } |
207 | } |
|
Line 202... | Line 208... | |||
202 | |
208 | |
|
Line 213... | Line 219... | |||
213 | |
219 | |
|
214 | ChangedConfigurationContinuation.Schedule(TimeSpan.FromSeconds(1), |
220 | ChangedConfigurationContinuation.Schedule(TimeSpan.FromSeconds(1), |
|
215 | async () => { await SaveConfiguration(); }, _cancellationToken); |
221 | async () => { await SaveConfiguration(); }, _cancellationToken); |
|
Line -... | Line 222... | |||
- | 222 | } |
||
- | 223 | |
||
- | 224 | private void Events_ExceptionEncountered(object sender, ExceptionEventArgs e) |
||
- | 225 | { |
||
- | 226 | Log.Error(e.Exception,$"Client threw exception."); |
||
216 | } |
227 | } |
|
217 | |
228 | |
|
218 | private async void Events_MessageReceived(object sender, MessageReceivedEventArgs e) |
229 | private async void Events_MessageReceived(object sender, MessageReceivedEventArgs e) |
|
Line 219... | Line 230... | |||
219 | { |
230 | { |
|
220 | Log.Information($"Client {e.Client.IpPort} sent {e.Data.Length} bytes via network sharing."); |
231 | Log.Information($"Client {e.Client?.IpPort} sent {e.Data?.Length} bytes via network sharing."); |
|
221 | |
232 | |
|
222 | if (e.Data.Length == 0) |
233 | if (e.Data?.Length == 0) |
|
Line 223... | Line 234... | |||
223 | { |
234 | { |
|
Line 230... | Line 241... | |||
230 | |
241 | |
|
Line 231... | Line 242... | |||
231 | var completeSnapshot = JsonConvert.DeserializeObject<TransferSnapshot>(payload); |
242 | var completeSnapshot = JsonConvert.DeserializeObject<TransferSnapshot>(payload); |
|
Line 232... | Line 243... | |||
232 | |
243 | |
|
233 | await _snapshotDatabase.ApplyTransferSnapshotAsync(completeSnapshot, _cancellationToken); |
244 | await _snapshotDatabase.ApplyTransferSnapshotAsync(completeSnapshot, _cancellationToken); |
|
234 | |
245 | |
|
235 | Log.Information($"Stored {completeSnapshot.Name} from {e.Client.IpPort}"); |
246 | Log.Information($"Stored {completeSnapshot.Name} from {e.Client?.IpPort}"); |
|
236 | } |
247 | } |
|
237 | catch (Exception exception) |
248 | catch (Exception exception) |
|
238 | { |
249 | { |
|
Line 239... | Line 250... | |||
239 | Log.Error(exception, $"Failed to process network share from {e.Client.IpPort}."); |
250 | Log.Error(exception, $"Failed to process network share from {e.Client?.IpPort}."); |
|
240 | } |
251 | } |
|
241 | } |
252 | } |
|
242 | |
253 | |
|
Line 243... | Line 254... | |||
243 | private void Events_ClientDisconnected(object sender, WatsonTcp.DisconnectionEventArgs e) |
254 | private void Events_ClientDisconnected(object sender, WatsonTcp.DisconnectionEventArgs e) |
|
244 | { |
255 | { |
|
245 | Log.Information($"Client {e.Client.IpPort} disconnected from network sharing."); |
256 | Log.Information($"Client {e.Client?.IpPort} disconnected from network sharing."); |
|
246 | } |
257 | } |
|
Line 247... | Line 258... | |||
247 | |
258 | |
|
248 | private void Events_ClientConnected(object sender, WatsonTcp.ConnectionEventArgs e) |
259 | private void Events_ClientConnected(object sender, WatsonTcp.ConnectionEventArgs e) |
|
249 | { |
260 | { |