Horizon – Diff between revs 20 and 21

Subversion Repositories:

?pathlinks?

Rev 20 – Rev 22 – Go to most recent revision – Details – Blame – Last modification – View Log

+            }
             var discoveredServiceMenuItem = new ToolStripMenuItem(service.Name, null, OnShareWithNodeClicked);
+            discoveredServiceMenuItem.Tag = service;
-            discoveredServiceMenuItem.Tag = service;
+            this.InvokeIfRequired(form =>
+            {
                 form.shareToToolStripMenuItem.DropDownItems.Add(discoveredServiceMenuItem);
-            shareToToolStripMenuItem.DropDownItems.Add(discoveredServiceMenuItem);
+            });
+        }
         private async Task TransferFiles(IReadOnlyList<DataGridViewRow> rows, Service service,
             IProgress<DataGridViewRowProgress> progress, CancellationToken cancellationToken)
+        {
             var client = new WatsonTcpClient($"{service.HostEntry.AddressList[0]}", service.UPort);
-            client.Events.MessageReceived += (sender, args) =>
+            client.Events.MessageReceived += Events_MessageReceived;
-            {
+            client.Events.ServerConnected += Events_ServerConnected;
-                Log.Information($"{args.Data.Length} byte long message received from {args.Client.IpPort}");
+            client.Events.ServerDisconnected += Events_ServerDisconnected;
-            };
+            client.Events.ExceptionEncountered += Events_ExceptionEncountered;
             try
                 for (var i = 0; i < count && !cancellationToken.IsCancellationRequested; ++i)
+                {
                     try
+                    {
+                        var completeSnapshot =
-                    {
+                            await _snapshotDatabase.GenerateTransferSnapshotAsync(
-                        var completeSnapshot = await _snapshotDatabase.GenerateTransferSnapshotAsync((string)rows[i].Cells["HashColumn"].Value, cancellationToken);
+                                (string)rows[i].Cells["HashColumn"].Value, cancellationToken);
+                    {
                         progress.Report(new DataGridViewRowProgressFailure(rows[i], i, exception));
+                    }
+                }
+            }
+            catch (SocketException exception)
+            {
+                Log.Error(exception, "Client threw exception.");
+            }
             finally
+            {
+                client.Events.MessageReceived -= Events_MessageReceived;
+                client.Events.ServerConnected -= Events_ServerConnected;
+                client.Events.ServerDisconnected -= Events_ServerDisconnected;
+                client.Events.ExceptionEncountered -= Events_ExceptionEncountered;
                 client.Dispose();
+            }
+        }
+        private void Events_ExceptionEncountered(object sender, ExceptionEventArgs e)
+        {
+            Log.Error(e.Exception, $"Client threw exception.");
+        }
+        private void Events_ServerDisconnected(object sender, DisconnectionEventArgs e)
+        {
+            Log.Information($"{e.Client?.IpPort} connected to server due to: {e.Reason}.");
+        }
+        private void Events_MessageReceived(object sender, MessageReceivedEventArgs e)
+        {
+            Log.Information($"{e.Data?.Length} byte long message received from {e.Client?.IpPort}");
+        }
+        private void Events_ServerConnected(object sender, WatsonTcp.ConnectionEventArgs e)
+        {
+            Log.Information($"{e.Client?.IpPort} connected to server.");
+        }
         private async Task RevertFile(IReadOnlyList<DataGridViewRow> rows, IProgress<DataGridViewRowProgress> progress,
                                       CancellationToken cancellationToken)